diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-09-09 14:55:19 +0100 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-09-09 14:55:19 +0100 |
commit | 9f83605638e5dbb6114535db5556f431f0384331 (patch) | |
tree | 6a105948ddfdaefe9e15d2365d67c228cfb1faf5 /Makefile | |
parent | 42c4cdbcf473cdd47d5dddb64f3d5ed25f34247b (diff) | |
parent | ffd155e9a729b194f045d73d0d5a2a82a0028c73 (diff) |
Merge branch 'release' into codegen-annotations
Conflicts:
spec/Connection.xml
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -90,7 +90,7 @@ clean: maintainer-upload-snapshot: doc/spec.html @install -d tmp cp doc/spec.html tmp/spec.html - sed -i~ -e 's,\(<h2>Version [0-9][0-9.]*\)\(</h2>\),\1 (darcs snapshot '`date +%Y%m%d`')\2,' \ + sed -i~ -e 's,\(<h2>Version [0-9][0-9.]*\)\(</h2>\),\1 (git commit '`git rev-list -n 1 --abbrev-commit --abbrev=8 HEAD`', '`date +%Y-%m-%d`')\2,' \ tmp/spec.html scp tmp/spec.html \ telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/spec-snapshot.html |