Gennadiy Civil
							
						 
					 | 
					
						
						
							
						
						af463c43ac
					 | 
					
						
						
							
							More merges, removing old dead code
						
						
						
						
						
						
					 | 
					
						2018-03-13 11:13:37 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hector Dearman
							
						 
					 | 
					
						
						
							
						
						41ad243d93
					 | 
					
						
						
							
							Fix typo in gmock-actions.h
						
						
						
						
						
						
						
						This upstreams a Google-internal change (141765019). 
						
						
					 | 
					
						2017-06-19 18:43:55 +01: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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |