summaryrefslogtreecommitdiff
path: root/update.sh
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2011-10-29 07:20:10 +0200
committerFlorent Le Coz <louiz@louiz.org>2011-10-29 07:20:10 +0200
commit0451127ff8a1b96772b58ff9e246621d0df4c99e (patch)
tree00a650ba6f909ee1977bedeb3001798f39a38a0a /update.sh
parentb98880b5269764ad69bb19262790d27b2575b174 (diff)
parentaa6738800d67c5061d7e551b3d896f3366296045 (diff)
downloadpoezio-0451127ff8a1b96772b58ff9e246621d0df4c99e.tar.gz
poezio-0451127ff8a1b96772b58ff9e246621d0df4c99e.tar.bz2
poezio-0451127ff8a1b96772b58ff9e246621d0df4c99e.tar.xz
poezio-0451127ff8a1b96772b58ff9e246621d0df4c99e.zip
Merge branch 'master' into plugins
Diffstat (limited to 'update.sh')
-rwxr-xr-xupdate.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/update.sh b/update.sh
index cc7b8962..510bbb07 100755
--- a/update.sh
+++ b/update.sh
@@ -7,7 +7,7 @@
# Use launch.sh to start poezio directly from here
echo 'Updating poezio'
-hg pull -u
+git pull origin master
if [ -e "SleekXMPP" ]
then