From e7151a2316fe0df49c5157c3196be9d71f1cff22 Mon Sep 17 00:00:00 2001
From: Warren <evilseph@unaligned.org>
Date: Thu, 3 Feb 2011 13:13:44 -0800
Subject: [PATCH] Added brief coding conventions - these may not be complete.

---
 README.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ceac2540..11c142df 100644
--- a/README.md
+++ b/README.md
@@ -3,10 +3,20 @@ Bukkit
 
 A Minecraft Server API.
 
+Coding Conventions
+-----------
+
+We generally follow the Sun/Oracle coding standards.
+No tabs; use 4 spaces instead.
+No trailing whitespaces.
+No 80 column limit or midstatement newlines.
+
+Follow the above conventions if you want your pull requests accepted.
+
 Compilation
 -----------
 
 We use maven to handle our dependencies.
 
 * Install [Maven 3](http://maven.apache.org/download.html)
-* Check out this repo and: `mvn clean install`
+* Check out this repo and: `mvn clean install`
\ No newline at end of file