Skip to content
Snippets Groups Projects
Commit 04a30c86 authored by Andreas Schuh's avatar Andreas Schuh
Browse files

Merge remote-tracking branch 'google/release' into 'master'. 

Conflicts:
	gflags-vs2003.sln
	gflags-vs2010.sln
	gflags-vs2012.sln
	vsprojects/gflags_unittest/gflags_unittest-vs2010.vcxproj
	vsprojects/libgflags/libgflags-vs2010.vcxproj
parents ec4ddb40 882db5d0
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1156 additions and 2815 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment