Merge branches 'CollisionRendering' and 'release'

2017-01-16 01:31:25 -07:00 · 2017-01-16 01:31:25 -07:00 · 9654cf1428
parent 7cc8e2a0c9 da5676d25b
commit 9654cf1428
1 changed files with 1 additions and 1 deletions
--- a/src/.qmake.conf
+++ b/src/.qmake.conf
@ -1,4 +1,4 @@
-# CONFIG += PUBLIC_RELEASE
+CONFIG += PUBLIC_RELEASE

 DEFINES += 	'APP_NAME=\"\\\"Prime World Editor\\\"\"' \
 			'APP_VERSION=\"\\\"1.1.1\\\"\"'