| commit | 04a30c86def26be1f7c6005ecd5057744b18bf13 | [log] [tgz] |
|---|---|---|
| author | Andreas Schuh <andreas.schuh.84@gmail.com> | Thu Mar 20 16:37:14 2014 +0000 |
| committer | Andreas Schuh <andreas.schuh.84@gmail.com> | Thu Mar 20 16:37:14 2014 +0000 |
| tree | dc553233d62032f6583d97728e771bdfe00f8056 | |
| parent | ec4ddb403a61e958fc2620878b26453676049b82 [diff] | |
| parent | 882db5d018c813cf8f037de4d4d6d9e876dd8804 [diff] |
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