Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
a2ab62c94a
60 changed files with 3185 additions and 88 deletions
5
.gitignore
vendored
5
.gitignore
vendored
|
|
@ -3,6 +3,7 @@ pom.xml.asc
|
|||
*.jar
|
||||
*.class
|
||||
*.log
|
||||
*.stl
|
||||
[0-9a-f]*-init.clj
|
||||
/lib/
|
||||
/classes/
|
||||
|
|
@ -18,6 +19,6 @@ pom.xml.asc
|
|||
.cpcache/
|
||||
*~
|
||||
|
||||
doc/.~lock.Population.ods#
|
||||
|
||||
.settings/
|
||||
.calva/output-window/output.calva-repl
|
||||
.settings/
|
||||
Loading…
Add table
Add a link
Reference in a new issue