Tiger Wang 37140ae578 Merge branch 'master' into portals ... Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp src/ClientHandle.h src/Entities/Player.cpp src/Entities/Player.h src/Generating/FinishGen.cpp src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol16x.cpp src/Protocol/Protocol16x.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/Root.h src/World.cpp		2014-07-18 20:10:51 +01:00
..
CMakeLists.txt	Cmake generated projects for IDEs include headers in project files.	2014-04-25 09:56:15 -07:00
SlotArea.cpp	Basic style fixes.	2014-07-17 22:50:58 +02:00
SlotArea.h	Fixed tabs used for alignment.	2014-07-17 23:16:55 +02:00
Window.cpp	Merge branch 'master' into portals	2014-07-18 20:10:51 +01:00
Window.h	Basic style fixes.	2014-07-17 22:50:58 +02:00
WindowOwner.h	Basic style fixes.	2014-07-17 22:50:58 +02:00