hurikhan 8a30feebbe Merge remote-tracking branch 'upstream/master' into x11-window-management ... Conflicts: platform/x11/detect.py		2015-01-14 13:31:16 +08:00
..
2d	-Add support for one-way collision in 2D (only works for kinematic body so far)	2015-01-13 21:19:11 -03:00
3d	fix demo 3d mousepick test	2014-12-16 15:17:29 +01:00
misc	don't start demo in fullscreen mode	2015-01-14 13:27:03 +08:00
viewport	-Added google play services (needed for some stuff)	2014-04-14 22:16:13 -03:00