diff options
author | Wink Saville <wink@google.com> | 2010-06-03 15:33:07 -0700 |
---|---|---|
committer | Wink Saville <wink@google.com> | 2010-06-03 15:33:07 -0700 |
commit | b3fe74bb7067581371f487b12112b62ef8e66b9e (patch) | |
tree | 69d9a1d58bd217c926fd9cdba321d288dfe09f1c /.gitignore | |
parent | e2d542951c059563a3b7f74c257dac4f222d9dc5 (diff) | |
download | external_protobuf-b3fe74bb7067581371f487b12112b62ef8e66b9e.zip external_protobuf-b3fe74bb7067581371f487b12112b62ef8e66b9e.tar.gz external_protobuf-b3fe74bb7067581371f487b12112b62ef8e66b9e.tar.bz2 |
Add libprotobuf-cpp-2.3.0-lite
Added android/config.h which will be used to configure
android builds of libraries. Currently I've undef HAVE_HASH_MAP
and HAVE_HASH_SET as the versions in stlport generated compile
errors.
Updated .gitignore to be more selective on what it ignores so
android/config.h wouldn't be ignored.
Change-Id: I53f3636121db2c6017491a37998b816aaf0cab5d
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 16 |
1 files changed, 9 insertions, 7 deletions
@@ -6,16 +6,18 @@ *~ *.lo *.la -Makefile -config.h -src/Makefile -/stamp.h1 .deps -config.log -config.status +/stamp-h1 +/Makefile +/src/Makefile +/config.log +/config.status +/config.h gtest/Makefile gtest/build-aux/config.h gtest/build-aux/stamp-h1 +gtest/config.log +gtest/config.status gtest/libtool gtest/scripts/gtest-config gtest/lib @@ -24,7 +26,6 @@ protobuf.pc protobuf-lite.pc libtool autom4te.cache/ -/stamp-h1 core src/google/protobuf/unittest*pb* src/google/protobuf/compiler/cpp/cpp*pb* @@ -41,4 +42,5 @@ src/testzip.jar src/testzip.list src/testzip.proto src/testzip.zip +vsprojects/config.h java/target/ |