Viewing all changes in revision 8.
- Committer: Bazaar Package Importer
- Date: 2009-06-04 14:47:43 UTC
- mfrom: (2.1.1 squeeze)
- Revision ID: james.westby@ubuntu.com-20090604144743-n51x29m2o3mpbblg
* Merge from debian unstable, remaining changes:
- src/google/protobuf/compiler/python/python_generator.cc:
do not hardcode python2.4
- src/gtest/internal/gtest-port.h
disable death tests if architecture is IA64
- src/google/protobuf/compiler/python/python_generator.cc:
do not hardcode python2.4
- src/gtest/internal/gtest-port.h
disable death tests if architecture is IA64
expand all
collapse all
added
removed
