diff options
| author | James Booth <boothj5@gmail.com> | 2015-05-19 22:38:36 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-05-19 22:38:36 +0100 |
| commit | 5ae012476cead42cc6885ba6c89af48e120258cc (patch) | |
| tree | 9032c09748c89b743acb3af5cf243fef40383c41 | |
| parent | 34d9b2b272ca2c35ab40dd181f2ea5a52e1dbc68 (diff) | |
| parent | 8d8b651cf293e18dd2c1f8fd8aad257e76d3c76a (diff) | |
| download | profani-tty-5ae012476cead42cc6885ba6c89af48e120258cc.tar.gz | |
Merge branch 'master' into openpgp
Conflicts: install-all.sh
| -rwxr-xr-x | install-all.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/install-all.sh b/install-all.sh index fc704bbc..b8e39d5e 100755 --- a/install-all.sh +++ b/install-all.sh @@ -24,7 +24,7 @@ debian_prepare() echo echo Profanity installer... installing dependencies echo - sudo apt-get -y install git automake autoconf libssl-dev libexpat1-dev libncursesw5-dev libglib2.0-dev libnotify-dev libcurl3-dev libxss-dev libotr5-dev libreadline-dev libtool libgpgme11-dev + sudo apt-get -y install git automake autoconf libssl-dev libexpat1-dev libncursesw5-dev libglib2.0-dev libnotify-dev libcurl3-dev libxss-dev libotr5-dev libreadline-dev libtool libgpgme11-dev uuid-dev } |