Anton Yabchinskiy 4ab1bcde35 Merge branch 'master' of github.com:okamstudio/godot ...

Conflicts:
	drivers/SCsub
	platform/x11/detect.py
	platform/x11/os_x11.h

2014-12-23 23:44:07 +03:00

..

android

Small batch of fixes

2014-12-15 15:42:58 -03:00

bb10

Merge pull request #643 from adolson/custom-export-binary-path-fix

2014-09-17 09:53:43 -03:00

flash

Build System Changes

2014-10-07 01:31:49 -03:00

iphone

-Ability to ask for documents/pictures/etc system dirs.

2014-12-02 14:02:41 -03:00

isim

Update ios simulator build config file to build under new ios SDK

2014-12-08 13:58:39 +08:00

javascript

Build System Changes

2014-10-07 01:31:49 -03:00

nacl

GODOT IS OPEN SOURCE

2014-02-09 22:10:30 -03:00

osx

Bug Fixes

2014-11-02 11:31:01 -03:00

server

Build System Changes

2014-10-07 01:31:49 -03:00

windows

New Code Completion

2014-12-16 22:31:57 -03:00

winrt

Fixes

2014-12-20 15:30:06 -03:00

x11

Merge branch 'master' of github.com:okamstudio/godot

2014-12-23 23:44:07 +03:00