Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll 2017-06-29 09:21:02 +02:00
commit e52a328396
1 changed files with 1 additions and 0 deletions

View File

@ -570,6 +570,7 @@
<java.awt.headless>true</java.awt.headless> <java.awt.headless>true</java.awt.headless>
</systemPropertyVariables> </systemPropertyVariables>
<argLine>-Xmx1024m</argLine> <argLine>-Xmx1024m</argLine>
<trimStackTrace>false</trimStackTrace>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>