Juan Linietsky 0a717ffee2 Merge branch 'master' of https://github.com/okamstudio/godot ...

Conflicts:
	modules/multiscript/register_types.cpp
	platform/android/java/src/com/android/godot/GodotLib.java

2014-03-13 23:14:35 -03:00

..

res

GODOT IS OPEN SOURCE

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

src/com/android/godot

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

2014-03-13 23:14:35 -03:00

ant.properties

-fix bug in cache for atlas import/export

2014-03-13 22:57:24 -03:00

build.properties

GODOT IS OPEN SOURCE

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

build.xml

GODOT IS OPEN SOURCE

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

default.properties

GODOT IS OPEN SOURCE

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

my-release-key.keystore

GODOT IS OPEN SOURCE

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

proguard-project.txt

GODOT IS OPEN SOURCE

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

proguard.cfg

GODOT IS OPEN SOURCE

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