| commit | 37099036614250e59828b33202e01a376101d639 | [log] [tgz] |
|---|---|---|
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | Wed Mar 18 22:27:22 2009 +0000 |
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | Wed Mar 18 22:27:22 2009 +0000 |
| tree | 8aaba414fcf3ac64a90b69d2e7b04397c9950db8 | |
| parent | 812e986e88e896cb625d98dd9ea4c39af1423b08 [diff] |
Merges changes in r214 from branches/release-1.3 to tags/release-1.3.0: svn merge -r 214:215 branches/release-1.3 tags/release-1.3.0
diff --git a/Makefile.am b/Makefile.am index 3d72d26..4868c68 100644 --- a/Makefile.am +++ b/Makefile.am
@@ -13,6 +13,7 @@ scons/SConscript \ scripts/fuse_gtest_files.py \ scripts/gen_gtest_pred_impl.py \ + scripts/test/Makefile \ test/gtest_all_test.cc # MSVC project files