diff options
author | Tanu Kaskinen <tanuk@iki.fi> | 2009-06-29 18:35:06 +0300 |
---|---|---|
committer | Tanu Kaskinen <tanuk@iki.fi> | 2009-06-29 18:35:06 +0300 |
commit | 0bc538b08ca5c4efea86700cb6c4685da3f34345 (patch) | |
tree | e5b0fe4b967ecb7e9251faf21904bbbe825aaab7 /Makefile.am | |
parent | b152f3a052eca7225870a7dc4d8a719bee107f0f (diff) | |
parent | 2654eb7781ddcfe53064745bbad77bffe5c8eada (diff) |
Merge branch 'master' into dbus-work
Conflicts:
src/daemon/daemon-conf.c
src/daemon/daemon-conf.h
src/daemon/main.c
src/pulsecore/dbus-util.h
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 2448e748..4d45a07d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,12 +62,6 @@ dist-hook: fi echo $(VERSION) > $(distdir)/.tarball-version -update-shave: - for i in shave.in shave.m4 shave-libtool.in; do \ - wget -O $$i http://git.lespiau.name/cgit/shave/blob/\?path=shave/$$i ; \ - done - mv shave.m4 m4/ - .PHONY: homepage distcleancheck doxygen # see git-version-gen |