Vladimir Timofeev a689fc4c7e sync with upstream ... Conflicts: CMakeLists.txt		2014-11-20 12:19:00 +03:00
..
Classes	fixes warnings on Android	2014-10-08 18:55:33 -07:00
Resources	added missing files for wp8	2014-06-23 08:35:39 -07:00
proj-wp8-xaml	remove PhoneDirect3DXamlAppComponent namespace refactor	2014-10-23 07:21:48 -07:00
proj.android	Android properties back to 10	2014-09-09 18:46:47 -07:00
proj.ios	Add Default-667h@2x and Default-737h@3x launch images to support iPhone6 and iPhone6+'s native resolution mode	2014-10-16 15:53:12 +08:00
proj.linux	updates CMakeLists.txt	2014-03-11 19:10:37 +08:00
proj.mac	Squashed commit of the following:	2014-09-09 12:18:31 -07:00
proj.win8.1-universal	updated template file copy build script to use App.Shared dir	2014-11-18 13:45:37 -08:00
proj.win32	change toolset from 12.0 to 4.0	2014-09-09 15:57:21 +08:00
.cocos-project.json	Solve the error when building android for sample projects of engine.	2014-11-18 18:39:53 +08:00
CMakeLists.txt	mingw fixes, now project builds with mingw64 and -DUSE_PREBUILT_LIBS=NO (some additional libs hardcoded still)	2014-11-17 01:42:04 +03:00