Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								f525f43e43 
								
							 
						 
						
							
							
								
								merge  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2018-04-30 09:30:43 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Moritz Kiefer 
								
							 
						 
						
							
							
							
							
								
							
							
								6b38edf102 
								
							 
						 
						
							
							
								
								Fix buffering issue in print_success for declare-datatype  
							
							 
							
							
							
						 
						
							2018-04-03 11:57:31 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								c513f3ca09 
								
							 
						 
						
							
							
								
								merge with master  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2018-03-25 14:57:01 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								8e09a78c26 
								
							 
						 
						
							
							
								
								fix   #1510  by reintroducing automatic declaration of recognizers  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2018-03-02 23:02:20 +09:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Moritz Kiefer 
								
							 
						 
						
							
							
							
							
								
							
							
								b0997661cc 
								
							 
						 
						
							
							
								
								Insert sort declaration for nullary sorts declared using declare-datatype  
							
							 
							
							
							
						 
						
							2018-02-19 17:53:53 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Bruce Mitchener 
								
							 
						 
						
							
							
							
							
								
							
							
								76eb7b9ede 
								
							 
						 
						
							
							
								
								Use nullptr.  
							
							 
							
							
							
						 
						
							2018-02-12 14:05:55 +07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								7b8101c502 
								
							 
						 
						
							
							
								
								fix bugs related to model-converter  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2018-01-17 12:25:24 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								39d1ad3edb 
								
							 
						 
						
							
							
								
								fix   #1390  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2017-12-07 05:15:53 +05:30  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								fd49a0c89c 
								
							 
						 
						
							
							
								
								added facility to persist model transformations  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2017-11-02 00:05:52 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								caaf0ba33c 
								
							 
						 
						
							
							
								
								model-add/del  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2017-11-01 22:32:22 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								3de8c193ea 
								
							 
						 
						
							
							
								
								implementing model updates  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2017-10-30 16:11:51 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								70f7846af5 
								
							 
						 
						
							
							
								
								move spacer_marshal to under parsers/smt2  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2017-10-24 03:18:59 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								77bbae65f5 
								
							 
						 
						
							
							
								
								fix   #1319 ,  fix   #1320  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2017-10-23 08:17:38 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Dan Liew 
								
							 
						 
						
							
							
							
							
								
							
							
								35f6746c60 
								
							 
						 
						
							
							
								
								Workaround regressions/smt2/error.smt2 test timing out.  
							
							 
							
							... 
							
							
							
							When ASan's LeakSanitizer is enabled leak checking is triggered
when `exit()` is called and it returns so many false positives that
it takes a long time to write them to the console.
To workaround this we simply call `_Exit()` instead. 
							
						 
						
							2017-10-16 08:56:17 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								f179d49f4f 
								
							 
						 
						
							
							
								
								check for eof, based on testing garbled repro from  #1267  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2017-09-24 10:58:39 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								95ee4c94f1 
								
							 
						 
						
							
							
								
								remove utf  fixes   #1265  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2017-09-23 11:37:55 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								936c22a00b 
								
							 
						 
						
							
							
								
								add pattern match validation  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2017-09-20 09:44:38 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								caa02c3c02 
								
							 
						 
						
							
							
								
								add match expression construct to SMT-LIB2.6 frontend  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2017-09-19 19:39:02 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								43e47271f7 
								
							 
						 
						
							
							
								
								have quantified tactics work with bound Boolean variables. Adding stubs for match  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2017-09-18 15:58:09 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								070c699ffc 
								
							 
						 
						
							
							
								
								remove V2 reference  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2017-09-10 15:32:53 +03:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								4fe55cf8e5 
								
							 
						 
						
							
							
								
								fix plugin translation  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2017-09-10 14:48:57 +03:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								7f127cdd5d 
								
							 
						 
						
							
							
								
								adding declarations for regression tests  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2017-09-06 09:48:10 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								d05d3bac4f 
								
							 
						 
						
							
							
								
								fix instantiations  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2017-09-05 20:12:48 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								9f5bd2feda 
								
							 
						 
						
							
							
								
								fix front-end for datatype  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2017-09-05 19:58:05 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								5d17e28667 
								
							 
						 
						
							
							
								
								support for smtlib2.6 datatype parsing  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2017-09-04 21:12:43 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								082936bca6 
								
							 
						 
						
							
							
								
								enable overloading resolution on define-fun declarations,  fix   #1199  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2017-08-08 09:21:06 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								2b82fd5d0c 
								
							 
						 
						
							
							
								
								updated include directives  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2017-08-01 10:51:47 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								b19f94ae5b 
								
							 
						 
						
							
							
								
								make include paths uniformly use path relative to src.  #534  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2017-07-31 13:24:11 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								d3e1d250a7 
								
							 
						 
						
							
							
								
								fixes   #1168  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2017-07-27 07:50:16 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								2cc6baede5 
								
							 
						 
						
							
							
								
								address  #1167  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2017-07-27 07:44:08 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								a94f5fb04a 
								
							 
						 
						
							
							
								
								fix compiler warnings  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2017-07-24 12:15:10 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								7fd0777cf1 
								
							 
						 
						
							
							
								
								fixes to  #1155  and partial introduction of SMTLIB 2.6 datatype format  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2017-07-24 09:18:16 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								a0a8bc2a62 
								
							 
						 
						
							
							
								
								fixes to  #1155  and partial introduction of SMTLIB 2.6 datatype format  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2017-07-24 09:12:43 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Christoph M. Wintersteiger 
								
							 
						 
						
							
							
							
							
								
							
							
								054e139c0d 
								
							 
						 
						
							
							
								
								Whitespace  
							
							 
							
							
							
						 
						
							2017-06-20 14:37:26 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Dan Liew 
								
							 
						 
						
							
							
							
							
								
							
							
								4b517b96df 
								
							 
						 
						
							
							
								
								[CMake] Move CMake files into their intended location so the  
							
							 
							
							... 
							
							
							
							`contrib/cmake/bootstrap.py` script no longer needs to be executed.
The previous location of the CMake files was a compromise proposed
by @agurfinkel in #461 . While this has served us well (allowing progress
to be made) over time limitations of this approach have appeared.
The main problem is that doing many git operations (e.g. pull, rebase)
means the CMake files don't get updated unless the user remembers to
run the script. This can lead to broken and confusing build system
behaviour.
This commit only does the file moving and necessary changes to
`.gitignore`. Other changes will be done in subsequent commits. 
							
						 
						
							2017-06-12 11:59:00 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Murphy Berzish 
								
							 
						 
						
							
							
							
							
								
							
							
								ab4fbe40b6 
								
							 
						 
						
							
							
								
								cleanup  
							
							 
							
							
							
						 
						
							2017-05-03 17:45:56 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Murphy Berzish 
								
							 
						 
						
							
							
							
							
								
							
							
								0862949e66 
								
							 
						 
						
							
							
								
								Merge branch 'upstream-master' into develop  
							
							 
							
							... 
							
							
							
							Conflicts:
	src/smt/params/smt_params.cpp
	src/smt/params/smt_params.h
	src/smt/smt_context.cpp
	src/smt/smt_context.h 
							
						 
						
							2017-05-01 21:33:23 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								0693a413b6 
								
							 
						 
						
							
							
								
								augment  #955  to handle hyphen  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2017-04-30 12:50:56 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								86f3526110 
								
							 
						 
						
							
							
								
								update get-value to also respect parameter model_index,  #955  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2017-04-30 11:48:06 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Murphy Berzish 
								
							 
						 
						
							
							
							
							
								
							
							
								725352234d 
								
							 
						 
						
							
							
								
								refactoring theory_str  
							
							 
							
							
							
						 
						
							2017-02-27 13:22:56 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Murphy Berzish 
								
							 
						 
						
							
							
							
							
								
							
							
								235ea79043 
								
							 
						 
						
							
							
								
								Merge branch 'upstream-master' into release-1.0  
							
							 
							
							... 
							
							
							
							Conflicts:
	src/cmd_context/check_logic.cpp
	src/cmd_context/cmd_context.cpp
	src/cmd_context/cmd_context.h
	src/smt/params/smt_params_helper.pyg
	src/smt/smt_context.cpp 
							
						 
						
							2017-02-18 15:04:44 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Christoph M. Wintersteiger 
								
							 
						 
						
							
							
							
							
								
							
							
								090a331d79 
								
							 
						 
						
							
							
								
								Added filenames to error messages for when we have more than one file.  
							
							 
							
							
							
						 
						
							2017-01-16 15:43:13 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								a444a33c30 
								
							 
						 
						
							
							
								
								updated encodings  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2016-12-22 17:45:21 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Murphy Berzish 
								
							 
						 
						
							
							
							
							
								
							
							
								11d8ffc4d4 
								
							 
						 
						
							
							
								
								escape characters in theory_str  
							
							 
							
							
							
						 
						
							2016-11-22 18:21:40 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								f3ef59b095 
								
							 
						 
						
							
							
								
								fix scanner bug at EOF  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2016-08-04 13:17:37 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								8da0146318 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/Z3Prover/z3  
							
							 
							
							
							
						 
						
							2016-06-14 08:10:21 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolaj Bjorner 
								
							 
						 
						
							
							
							
							
								
							
							
								9253ca9d86 
								
							 
						 
						
							
							
								
								make use of warning_msg safe for formatting. Thanks to Scott McPeak for reporting  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 
						
							2016-06-14 08:10:10 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Christoph M. Wintersteiger 
								
							 
						 
						
							
							
							
							
								
							
							
								3ea71b4b25 
								
							 
						 
						
							
							
								
								Fixed SMT2 scanner to allow 0xFF characters.  
							
							 
							
							... 
							
							
							
							Thanks to Santiago Zanella-Beguelin for reporting this issue. 
							
						 
						
							2016-06-14 12:49:48 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Murphy Berzish 
								
							 
						 
						
							
							
							
							
								
							
							
								b5fe473c3a 
								
							 
						 
						
							
							
								
								fix compilation errors after merge  
							
							 
							
							
							
						 
						
							2016-06-01 17:50:45 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Murphy Berzish 
								
							 
						 
						
							
							
							
							
								
							
							
								d79837eed0 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into upstream-master  
							
							 
							
							... 
							
							
							
							Conflicts:
	.gitignore
	README
	src/ast/ast_smt2_pp.h
	src/ast/ast_smt_pp.cpp
	src/ast/reg_decl_plugins.cpp
	src/cmd_context/cmd_context.cpp
	src/parsers/smt2/smt2parser.cpp 
							
						 
						
							2016-06-01 17:40:52 -04:00