Merge branch 'master' into patch-1
This commit is contained in:
		
						commit
						2d827ac14a
					
				@ -47,6 +47,7 @@
 | 
				
			|||||||
#include <ostream>  // NOLINT
 | 
					#include <ostream>  // NOLINT
 | 
				
			||||||
#include <sstream>
 | 
					#include <sstream>
 | 
				
			||||||
#include <string>
 | 
					#include <string>
 | 
				
			||||||
 | 
					#include <type_traits>
 | 
				
			||||||
#include <utility>
 | 
					#include <utility>
 | 
				
			||||||
#include <vector>
 | 
					#include <vector>
 | 
				
			||||||
#include "gmock/internal/gmock-internal-utils.h"
 | 
					#include "gmock/internal/gmock-internal-utils.h"
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user