Tiger Wang 8811837aea Merge branch 'master' into portals ... Conflicts: src/World.h		2014-07-29 15:27:19 +01:00
..
CMakeLists.txt	Subdirs: Only add_library if not using MSVC	2014-07-18 17:41:43 -07:00
SlotArea.cpp	Change comment.	2014-07-26 13:29:25 +02:00
SlotArea.h	Add armor items directly to the armor slots.	2014-07-20 01:22:58 +02:00
Window.cpp	Merge remote-tracking branch 'origin/master' into portals	2014-07-22 10:24:28 +01:00
Window.h	Style: Normalized to no spaces before closing parenthesis.	2014-07-21 17:40:43 +02:00
WindowOwner.h	Basic style fixes.	2014-07-17 22:50:58 +02:00