Merge

Tue, 27 May 2014 14:39:39 -0700

author
asaha
date
Tue, 27 May 2014 14:39:39 -0700
changeset 917
809d393a6379
parent 916
b596502e86f5
parent 887
d522ff5f5373
child 918
7193ccdc30ae

Merge

     1.1 --- a/make/project.properties	Mon May 19 22:00:46 2014 -0700
     1.2 +++ b/make/project.properties	Tue May 27 14:39:39 2014 -0700
     1.3 @@ -244,7 +244,7 @@
     1.4  test.src.dir=test/src
     1.5  
     1.6  # -Xmx is used for all tests, -Xms only for octane benchmark
     1.7 -run.test.xmx=3G
     1.8 +run.test.xmx=2G
     1.9  run.test.xms=2G
    1.10  
    1.11  run.test.user.language=tr

mercurial