Merge branch 'master' into pgp

Conflicts: .travis.yml
2015-04-12 00:04:37 +01:00
parent 7e4b756e44 a8669bb2bd
commit 7ba7e098fe
1 changed files with 1 additions and 1 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: c
 install:
    - sudo apt-get update
-    - sudo apt-get -y install libssl-dev libexpat1-dev libncursesw5-dev libglib2.0-dev libnotify-dev libcurl3-dev libxss-dev libotr2-dev libgpgme11-dev
+    - sudo apt-get -y install libssl-dev libexpat1-dev libncursesw5-dev libglib2.0-dev libnotify-dev libcurl3-dev libxss-dev libotr2-dev libgpgme11-dev uuid-dev
    - git clone git://github.com/strophe/libstrophe.git
    - cd libstrophe
    - mkdir m4