fix conflicts

This commit is contained in:
Ellison Leão
2014-07-29 13:06:09 -03:00
parent 1c13137bad
commit 83fad835e0

View File

@@ -195,6 +195,7 @@ All with one codebase.
* [Gideros](http://giderosmobile.com/) - A Cross-Platform framework to create Mobile Apps and games for iOS, Android using Lua programming language.
* [MOAI](http://getmoai.com/) - Cross-Platform framework designed for pro game developers to create iOS, Android, Windows, Linux, Chrome and OSX games using C++, OpenGL and Lua scripting.
* [GameSalad](http://gamesalad.com/) - Game Creation Engine for Mac and Windows.
* [Agen](http://2dengine.com) - Cross-Platform framework for making 2D games with Lua, compatible iOS, Mac and Windows devices.
* [KiwiJS](http://www.kiwijs.org/) - a fun and friendly Open Source HTML5 Game Engine. Some people call it the WordPress of HTML5 game engines
* [PandaJS](http://www.pandajs.net/) - Open Source HTML5 Engine.