Merge branch 'master' into feature/dan

This commit is contained in:
John 2015-08-31 01:07:00 +03:00
commit 9b443fb3fe

4
.gitmodules vendored
View file

@ -1,6 +1,6 @@
[submodule "resources"]
path = resources
url = http://Repo.Ez-webz.com/Stride/resources.git
url=https://github.com/ToontownStride1/resources
[submodule "build/nirai/src"]
path = build/nirai/src
url = https://github.com/nirai-compiler/src
@ -9,4 +9,4 @@
url = https://github.com/nirai-compiler/panda3d
[submodule "build/nirai/python"]
path = build/nirai/python
url = https://github.com/nirai-compiler/python
url = https://github.com/nirai-compiler/python