4 Commits

Author	SHA1	Message	Date
boyu0	dc6503f7d4	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2345_refactor_ccimage	2013-08-06 13:37:38 +08:00
boyu0	94f9921d5e	issue #2345: edit linux command to link the libpng12-dev.lib instead of use ourselves. Move ccTexParams into CCTexture2D	2013-08-06 11:34:48 +08:00
Sergey Shambir	7385db5a34	Linux: added SDL2 to travis scripts and install-deps-linux.sh	2013-07-30 23:20:18 +04:00
Sam Clegg	52791bd85d	Add .travis.yml ... This builds all libraries and examples in both debug and release for Linux and NaCl platforms. Add travis build status image to README.mdown. Also, split the linux dependency installation into its own script: install-deps-linux.sh	2013-04-29 16:46:51 -07:00