Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
9e8d59c2d1
46 changed files with 515 additions and 154 deletions
5
.gitignore
vendored
5
.gitignore
vendored
|
|
@ -5,6 +5,7 @@ pom.xml.asc
|
|||
*.log
|
||||
*.stl
|
||||
[0-9a-f]*-init.clj
|
||||
/bin/
|
||||
/lib/
|
||||
/classes/
|
||||
/target/
|
||||
|
|
@ -31,3 +32,7 @@ libbulletjme.so
|
|||
liblwjgl64.so
|
||||
|
||||
libopenal64.so
|
||||
|
||||
.settings/
|
||||
.classpath
|
||||
.project
|
||||
Loading…
Add table
Add a link
Reference in a new issue