Mercurial Mercurial > hdabo / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with 4b3a444be84a9edd2f326ed9fe82895a53a66712
authorrougeronj
Fri, 12 Dec 2014 11:04:02 +0100
changeset 404 f6b3ecaa3c58
parent 403 7bf61c597cb0 (current diff)
parent 402 4b3a444be84a (diff)
child 405 19d1264a8974
Merge with 4b3a444be84a9edd2f326ed9fe82895a53a66712
--- a/.hgtags	Fri Dec 12 11:02:20 2014 +0100
+++ b/.hgtags	Fri Dec 12 11:04:02 2014 +0100
@@ -80,3 +80,4 @@
 c7ede051639b6a5885c029e0981536acb945f5bb V03.00-alpha.03
 33c56d7137045797bc199c3fbde69f9d7b12de80 V03.00-alpha.04
 0dd3dbb9ca00d7bc691d93125c711f9601557ae0 V03.00-alpha.05
+08d30e121c86edcf7f7ee79068597a3d972195ad V03.00-alpha.06
--- a/sbin/sync/sync_hdabo	Fri Dec 12 11:02:20 2014 +0100
+++ b/sbin/sync/sync_hdabo	Fri Dec 12 11:04:02 2014 +0100
@@ -9,7 +9,7 @@
 #text2unix ~/tmp/hdabo_V$1
 
 if [ -d ~/tmp/hdabo_V$1 ]; then
-    cat <<EOT | rsync -Cvrlz --delete --filter=". -" ~/tmp/hdabo_V$1/web/ iri@web.iri.centrepompidou.fr:/iridata/www/exp/hdabo/
+    cat <<EOT | rsync -Cvrlz --delete --filter=". -" ~/tmp/hdabo_V$1/src/ iri@web.iri.centrepompidou.fr:/iridata/www/exp/hdabo/
 + core
 - hdalab/***
 P .htpasswd
--- a/src/hdalab/__init__.py	Fri Dec 12 11:02:20 2014 +0100
+++ b/src/hdalab/__init__.py	Fri Dec 12 11:04:02 2014 +0100
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-VERSION = (3, 0, 0, "alpha", 5)
+VERSION = (3, 0, 0, "alpha", 6)
 
 
 def get_version():
hdabo