Merge branch 'master' of github.com:Bukkit/CraftBukkit

This commit is contained in:
VictorD 2011-02-03 22:33:40 +01:00
commit 3a19f9e429

View File

@ -3,6 +3,16 @@ CraftBukkit
A Bukkit (Minecraft Server API) implementation
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
-----------