Gennadiy Civil
							
						 
					 | 
					
						
						
							
						
						9fba103156
					 | 
					
						
						
							
							merging, testing, this should be it
						
						
						
						
						
						
					 | 
					
						2018-04-16 10:42:08 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gennadiy Civil
							
						 
					 | 
					
						
						
							
						
						1c6e68cf6c
					 | 
					
						
						
							
							merging
						
						
						
						
						
						
					 | 
					
						2018-04-16 10:34:07 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gennadiy Civil
							
						 
					 | 
					
						
						
							
						
						26c10dc7e6
					 | 
					
						
						
							
							merging
						
						
						
						
						
						
					 | 
					
						2018-04-16 10:16:48 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gennadiy Civil
							
						 
					 | 
					
						
						
							
						
						d84eb86df5
					 | 
					
						
						
							
							more pizza
						
						
						
						
						
						
					 | 
					
						2018-04-13 16:04:34 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gennadiy Civil
							
						 
					 | 
					
						
						
							
						
						f45728a5ac
					 | 
					
						
						
							
							more OSX pizzas
						
						
						
						
						
						
					 | 
					
						2018-04-13 15:48:57 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gennadiy Civil
							
						 
					 | 
					
						
						
							
						
						b74a1af00f
					 | 
					
						
						
							
							osx pizzas
						
						
						
						
						
						
					 | 
					
						2018-04-13 11:49:37 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gennadiy Civil
							
						 
					 | 
					
						
						
							
						
						f9bd6180de
					 | 
					
						
						
							
							merging gmock actions test
						
						
						
						
						
						
					 | 
					
						2018-04-13 11:02:55 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gennadiy Civil
							
						 
					 | 
					
						
						
							
						
						0bfa823785
					 | 
					
						
						
							
							merging, gmock actions test
						
						
						
						
						
						
					 | 
					
						2018-04-13 11:02:25 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gennadiy Civil
							
						 
					 | 
					
						
						
							
						
						39c58da187
					 | 
					
						
						
							
							merge
						
						
						
						
						
						
					 | 
					
						2018-04-10 16:10:34 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gennadiy Civil
							
						 
					 | 
					
						
						
							
						
						e1071eb949
					 | 
					
						
						
							
							RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging the PR
						
						
						
						
						
						
					 | 
					
						2018-04-10 15:57:16 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gennadiy Civil
							
						 
					 | 
					
						
						
							
						
						ca54b67303
					 | 
					
						
						
							
							Revert "gmock actions 2"
						
						
						
						
						
						
					 | 
					
						2018-04-09 22:10:12 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gennadiy Civil
							
						 
					 | 
					
						
						
							
						
						05b5a53898
					 | 
					
						
						
							
							formatting
						
						
						
						
						
						
					 | 
					
						2018-04-09 15:50:19 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gennadiy Civil
							
						 
					 | 
					
						
						
							
						
						e93a0ece26
					 | 
					
						
						
							
							msvc
						
						
						
						
						
						
					 | 
					
						2018-04-09 13:51:01 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gennadiy Civil
							
						 
					 | 
					
						
						
							
						
						8bc7c631e8
					 | 
					
						
						
							
							testing msvc again
						
						
						
						
						
						
					 | 
					
						2018-04-09 11:35:01 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gennadiy Civil
							
						 
					 | 
					
						
						
							
						
						c4e3d77ddc
					 | 
					
						
						
							
							More msvc 14
						
						
						
						
						
						
					 | 
					
						2018-04-09 11:22:11 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gennadiy Civil
							
						 
					 | 
					
						
						
							
						
						88fc7d7552
					 | 
					
						
						
							
							merging gmock-actions 2
						
						
						
						
						
						
					 | 
					
						2018-04-06 09:50:01 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gennadiy Civil
							
						 
					 | 
					
						
						
							
						
						fe402c2779
					 | 
					
						
						
							
							Merging gMock, 2
						
						
						
						
						
						
					 | 
					
						2018-04-05 16:09:17 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gennadiy Civil
							
						 
					 | 
					
						
						
							
						
						af463c43ac
					 | 
					
						
						
							
							More merges, removing old dead code
						
						
						
						
						
						
					 | 
					
						2018-03-13 11:13:37 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Scott Graham
							
						 
					 | 
					
						
						
							
						
						567b40eeb1
					 | 
					
						
						
							
							Try to handle unsigned wchar_t (arm) a bit better
						
						
						
						
						
						
					 | 
					
						2018-02-23 12:28:09 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Troy Holsapple
							
						 
					 | 
					
						
						
							
						
						c8510504dd
					 | 
					
						
						
							
							Fixed typos
						
						
						
						
						
						
					 | 
					
						2018-02-07 22:06:00 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Mentovai
							
						 
					 | 
					
						
						
							
						
						a0435dc687
					 | 
					
						
						
							
							googlemock: Support C++11 language with pre-C++11 library
						
						
						
						
						
						
						
						This guards use of <type_traits> and its features with
GTEST_HAS_STD_TYPE_TRAITS_, and std::function with
GTEST_HAS_STD_FUNCTION_. 
						
						
					 | 
					
						2015-10-12 17:59:11 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Billy Donahue
							
						 
					 | 
					
						
						
							
						
						affb09edf0
					 | 
					
						
						
							
							move googlemock files into googlemock/ subdir
						
						
						
						
						
						
					 | 
					
						2015-08-25 17:47:18 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |