diff options
| author | James Booth <boothj5@gmail.com> | 2015-04-12 00:04:37 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-04-12 00:04:37 +0100 |
| commit | 7ba7e098fead9e7a9a72090e30bc64d9a12e87ee (patch) | |
| tree | e4ae07217890161c1290a663f580638820eec3b4 /.travis.yml | |
| parent | 7e4b756e44892fe726153652ecdb76d6158e3f30 (diff) | |
| parent | a8669bb2bd9ff5dd011fea1b92f733e00cb52570 (diff) | |
| download | profani-tty-7ba7e098fead9e7a9a72090e30bc64d9a12e87ee.tar.gz | |
Merge branch 'master' into pgp
Conflicts: .travis.yml
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 6efa5d82..a71e321e 100644 --- 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 |