Tiny changes

AlloyTools · Nov 3, 2017 · 5fdfc37 · 5fdfc37
1 parent d46edca
commit 5fdfc37
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,31 @@ enroute.zip
 org.alloytools.alloy.application/src/main/java/edu/mit/csail/sdg/alloy4compiler/parser/CompLexer.java
 org.alloytools.alloy.application/src/main/java/edu/mit/csail/sdg/alloy4compiler/parser/CompParser.java
 org.alloytools.alloy.application/src/main/java/edu/mit/csail/sdg/alloy4compiler/parser/CompSym.java
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+
diff --git a/org.alloytools.alloy.application/src/main/java/edu/mit/csail/sdg/alloy4/A4Preferences.java b/org.alloytools.alloy.application/src/main/java/edu/mit/csail/sdg/alloy4/A4Preferences.java
@@ -621,7 +621,8 @@ public Object renderValueLong(
 	 * The amount of memory (in M) to allocate for Kodkod and the SAT solvers.
 	 */
 	public static final IntChoicePref					SubMemory				= new IntChoicePref("SubMemory",
-			"Maximum memory", Arrays.asList(256, 512, 768, 1024, 1536, 2048, 2560, 3072, 3584, 4096), 768) {
+			"Maximum memory", Arrays.asList(768, 1024, 1536, 2048, 2560, 3072, 3584, 4096, 8192, 16384),
+			2084) {
 																					@Override
 																					public Object renderValueShort(
 																							Integer value) {

diff --git a/org.alloytools.kodkod.core/bnd.bnd b/org.alloytools.kodkod.core/bnd.bnd
@@ -32,6 +32,7 @@ Export-Package: \
 
 -testpath: \
 	osgi.enroute.junit.wrapper, \
+	osgi.enroute.hamcrest.wrapper
 
 -includeresource: LICENSE