Tiger Wang 3acdf25b05 Merge remote-tracking branch 'origin/master' into c++11 ...

Conflicts:
	src/OSSupport/Thread.cpp

2014-12-06 17:41:48 +00:00

..

CMakeLists.txt

Subdirs: Only add_library if not using MSVC

2014-07-18 17:41:43 -07:00

SlotArea.cpp

Merge remote-tracking branch 'origin/master' into c++11

2014-12-06 17:41:48 +00:00

SlotArea.h

e.t.c. -> etc.

2014-09-13 11:15:16 +01:00

Window.cpp

En masse NULL -> nullptr replace

2014-10-22 20:12:49 -07:00

Window.h

En masse NULL -> nullptr replace

2014-10-22 20:12:49 -07:00

WindowOwner.h

En masse NULL -> nullptr replace

2014-10-22 20:12:49 -07:00