diff options
| author | Jisi Liu <liujisi@google.com> | 2016-07-29 14:49:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-29 14:49:13 -0700 |
| commit | 915d79efa871ae6cd1922c52bd48635035be3c93 (patch) | |
| tree | a81ba61f1e0e45202dbb45d28142bdd541666d22 | |
| parent | 169d0ca43c5663c1b36cf4918f08aa031f5df468 (diff) | |
| parent | 3ef07568cd701338cb5babfee2f667efa1fad606 (diff) | |
| download | protobuf-915d79efa871ae6cd1922c52bd48635035be3c93.tar.gz protobuf-915d79efa871ae6cd1922c52bd48635035be3c93.tar.bz2 protobuf-915d79efa871ae6cd1922c52bd48635035be3c93.zip | |
Merge pull request #1895 from google/3.0.0-GA
Merge GA branch for makedist fix.
| -rw-r--r-- | Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index ccbfd065..c2d98048 100644 --- a/Makefile.am +++ b/Makefile.am @@ -656,6 +656,7 @@ python_EXTRA_DIST= \ python/google/protobuf/text_encoding.py \ python/google/protobuf/text_format.py \ python/mox.py \ + python/setup.cfg \ python/setup.py \ python/stubout.py \ python/tox.ini \ |