1
1
mirror of https://github.com/profanity-im/profanity.git synced 2025-01-03 14:57:42 -05:00

Merge branch 'master' into pgp

Conflicts:
	.travis.yml
This commit is contained in:
James Booth 2015-04-12 00:04:37 +01:00
commit 7ba7e098fe

View File

@ -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