Merge branch 'master' of github.com:panda3d/panda3d

This commit is contained in:
rdb 2014-12-03 21:53:58 +01:00
commit 15b88283b2
6 changed files with 23 additions and 3 deletions

4
.gitignore vendored Normal file
View File

@ -0,0 +1,4 @@
/built_x64
/built
/samples
/thirdparty

5
direct/.gitignore vendored
View File

@ -1,5 +1,8 @@
*.pyc *.pyc
/__init__.py /__init__.py
/built/ # These are files that are generated within the source tree by the
# ppremake system.
Makefile Makefile
pp.dep pp.dep
/built/
Opt?-*

5
dtool/.gitignore vendored
View File

@ -1,4 +1,7 @@
/built/
/dtool_config.h /dtool_config.h
# These are files that are generated within the source tree by the
# ppremake system.
Makefile Makefile
pp.dep pp.dep
/built/
Opt?-*

1
makepanda/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
*.pyc

6
panda/.gitignore vendored
View File

@ -1 +1,7 @@
*.pyc *.pyc
# These are files that are generated within the source tree by the
# ppremake system.
Makefile
pp.dep
/built/
Opt?-*

View File

@ -1,3 +1,6 @@
/built/ # These are files that are generated within the source tree by the
# ppremake system.
Makefile Makefile
pp.dep pp.dep
/built/
Opt?-*