Auto stash before merge of "develop" and "origin/develop"
This commit is contained in:
parent
cb28151712
commit
9aa161725b
4 changed files with 66 additions and 10 deletions
|
|
@ -1,26 +1,29 @@
|
|||
{
|
||||
"folders": [
|
||||
{
|
||||
"path": "../GreatGameTerrain"
|
||||
},
|
||||
"path": "../biome"
|
||||
}
|
||||
{
|
||||
"path": "../walkmap"
|
||||
"path": "../GreatGameTerrain"
|
||||
},
|
||||
{
|
||||
"path": "../jme-clj"
|
||||
},
|
||||
{
|
||||
"path": "../MicroWorld/mw-parser"
|
||||
},
|
||||
{
|
||||
"path": "../MicroWorld/mw-engine"
|
||||
},
|
||||
{
|
||||
"path": "."
|
||||
},
|
||||
{
|
||||
"path": "../test-graphs"
|
||||
},
|
||||
{
|
||||
"path": "../speechio"
|
||||
},
|
||||
{
|
||||
"path": "." /* the great game itself */
|
||||
},
|
||||
{
|
||||
"path": "../walkmap"
|
||||
},
|
||||
{
|
||||
"path": "../wherefore-art-thou"
|
||||
},
|
||||
|
|
@ -36,4 +39,4 @@
|
|||
"java.compile.nullAnalysis.mode": "automatic",
|
||||
"java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx2G -Xms100m -Xlog:disable"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue