fix conflicts

This commit is contained in:
Ellison Leão
2014-07-21 14:16:25 -03:00

View File

@@ -136,6 +136,7 @@ desktop browsers.
* [Bullet](http://bulletphysics.org/wordpress/) - Real-time physics simulation.
* [ODE](http://www.ode.org/) - ODE is an open source, high performance library for simulating rigid body dynamics.
* [Dash](https://github.com/Circular-Studios/Dash) - A free and open 3D game engine written in D.
* [jMonkeyEngine 3](http://jmonkeyengine.org/) - a 3D open-source game engine for adventurous Java developers.
Audio
-----