Merge remote-tracking branch 'asm/asm_16.2.2' into master_16.2.2

Former-commit-id: a99f0beeb263840b8e0224d417d817f9eca11bf6
This commit is contained in:
Shawn.Hooper 2016-04-21 13:25:05 -04:00
commit 9f587af75f

View file

@ -32,9 +32,9 @@
-XX:G1MixedGCLiveThresholdPercent=25
-XX:G1OldCSetRegionThresholdPercent=25
-XX:G1HeapWastePercent=5</vmArgs>
<vmArgsLin>-Xmx2560M -XX:MaxDirectMemorySize=2G
<vmArgsLin>-Xmx6144M -XX:MaxDirectMemorySize=2G
-XX:OnOutOfMemoryError=&quot;capture -t no -p $pid &amp;&quot;</vmArgsLin>
<vmArgsWin>-Dfile.encoding=UTF-8 -Xmx2560M</vmArgsWin>
<vmArgsWin>-Dfile.encoding=UTF-8 -Xmx6144M</vmArgsWin>
</launcherArgs>
<windowImages i16="/com.raytheon.viz.product.awips/icons/cave_16x16.png" i32="/com.raytheon.viz.product.awips/icons/cave_32x32.png" i48="/com.raytheon.viz.product.awips/icons/cave_48x48.png" i64="/com.raytheon.viz.product.awips/icons/cave_64x64.png" i128="/com.raytheon.viz.product.awips/icons/cave_128x128.png"/>