diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2015-08-25 20:24:43 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-08-25 20:24:43 -0700 |
| commit | b192ba87f72b5e3e8add09bbcbb7623831e3079b (patch) | |
| tree | affb3beff3c33050e7f93647ddab8606899ff03d /Makefile.am | |
| parent | 5da0b46811a103bd1a953f496d4bcd5ff45d3736 (diff) | |
| parent | cf94f7b74495d08b833056016e045a0ae3fb64fa (diff) | |
| download | protobuf-b192ba87f72b5e3e8add09bbcbb7623831e3079b.tar.gz protobuf-b192ba87f72b5e3e8add09bbcbb7623831e3079b.tar.bz2 protobuf-b192ba87f72b5e3e8add09bbcbb7623831e3079b.zip | |
Merge remote-tracking branch 'origin/master' into beta-1
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 0e137c0e..202974e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -538,7 +538,6 @@ python_EXTRA_DIST= \ python/google/protobuf/text_format.py \ python/google/protobuf/__init__.py \ python/google/__init__.py \ - python/ez_setup.py \ python/setup.py \ python/mox.py \ python/stubout.py \ |