Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures

Browse Source

Conflicts:
	src/Bindings/Bindings.cpp
	src/Bindings/Bindings.h
	src/Blocks/BlockHandler.cpp

...

This commit is contained in:

Tiger Wang

2013-12-08 14:02:45 +00:00

parent f64dd786aa 6785bb7c16

commit 1d554677b4

48 changed files with 1376 additions and 1279 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

src/Bindings/PluginManager.cpp

+1668

File diff suppressed because it is too large Load Diff