projects / platform / upstream / gflags.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ec4ddb4 882db5d)
Merge remote-tracking branch 'google/release' into 'master'.
authorAndreas Schuh <andreas.schuh.84@gmail.com>
Thu, 20 Mar 2014 16:37:14 +0000 (16:37 +0000)
committerAndreas Schuh <andreas.schuh.84@gmail.com>
Thu, 20 Mar 2014 16:37:14 +0000 (16:37 +0000)
Conflicts:
gflags-vs2003.sln
gflags-vs2010.sln
gflags-vs2012.sln
vsprojects/gflags_unittest/gflags_unittest-vs2010.vcxproj
vsprojects/libgflags/libgflags-vs2010.vcxproj


Trivial merge
Domain: System / Base;