merge

Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/model-checker

Conflicts:
	config.h
	model.cc

diff --cc config.h
index 94885427b3df46782b27ccb5ded48a6fac1e8c36,e064e39a4a2f3a742f7b02d1b1229fa98da2b684..aacbb81db38613e43e10ff5ab6c43751173c6d30
--- 1/config.h
--- 2/config.h
+++ b/config.h
@@@ -48,6 -48,7 +48,10 @@@
  /* Size of stack to allocate for a thread. */
  #define STACK_SIZE (1024 * 1024)
  
++/** How many shadow tables of memory to preallocate for data race detector. */
 +#define SHADOWBASETABLES 4
 +
+ /** Enable debugging assertions (via ASSERT()) */
+ #define CONFIG_ASSERT
+ 
  #endif

diff --cc datarace.cc
Simple merge