diff options
| author | Mike Ruprecht <mike.ruprecht@collabora.co.uk> | 2010-03-04 16:28:33 -0600 |
|---|---|---|
| committer | Mike Ruprecht <mike.ruprecht@collabora.co.uk> | 2010-03-04 16:28:33 -0600 |
| commit | c1d78452e13c0090d8466e9f3c367e5cc233b6b5 (patch) | |
| tree | f636375b3b6869ba6aa64b48017c202a2c43834c /tools | |
| parent | 864f11b00e31650276f0dbfc2ed00a91ad462256 (diff) | |
| download | telepathy-haze-c1d78452e13c0090d8466e9f3c367e5cc233b6b5.tar.gz | |
Fix extra merge issues.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index aba238c..4b14f39 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,6 +1,5 @@ EXTRA_DIST = \ with-session-bus.sh \ - shave.mk \ c-constants-gen.py \ doc-generator.xsl \ glib-ginterface-gen.py \ |