diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2015-12-21 00:31:04 -0800 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-12-21 00:34:19 -0800 |
| commit | d21780841734326d8a7653710f4f23b5366c4447 (patch) | |
| tree | 25df44708c81059a3e1c7025e12b734cc80ee3f4 /Makefile.am | |
| parent | 1e2fece3e01b8e079b4f6930306377a9332a2ddb (diff) | |
| parent | b27f2893b2a118b4e3bfcd23d32114dbdd4e6d9b (diff) | |
Merge branch master into v3.0.0-beta-2
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 2ec651e3..280ac2d6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -475,7 +475,6 @@ objectivec_EXTRA_DIST= \ objectivec/Tests/GPBMessageTests.m \ objectivec/Tests/GPBObjectiveCPlusPlusTest.mm \ objectivec/Tests/GPBPerfTests.m \ - objectivec/Tests/GPBStringTests.m \ objectivec/Tests/GPBSwiftTests.swift \ objectivec/Tests/GPBTestUtilities.h \ objectivec/Tests/GPBTestUtilities.m \ |