summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-03-18 22:26:03 +0000
committerzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-03-18 22:26:03 +0000
commit7f1b3c593a1e0c1c02258e7c0f51832ba9a88a0b (patch)
tree8aaba414fcf3ac64a90b69d2e7b04397c9950db8
parent380a296153241c61462a2ea6cedef37bc9c57508 (diff)
downloadgoogletest-release-1.3.tar.gz
Propagates change in r214 from trunk to branches/release-1.3:release-1.3
svn merge -r 212:214 trunk branches/release-1.3 git-svn-id: http://googletest.googlecode.com/svn/branches/release-1.3@215 861a406c-534a-0410-8894-cb66d6ee9925
-rw-r--r--Makefile.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 3d72d26..4868c68 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,6 +13,7 @@ EXTRA_DIST = \
scons/SConscript \
scripts/fuse_gtest_files.py \
scripts/gen_gtest_pred_impl.py \
+ scripts/test/Makefile \
test/gtest_all_test.cc
# MSVC project files