aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Merge branch 'master' into plugins

Browse Source 
Conflicts:
	.travis.yml
This commit is contained in:
James Booth 2014-02-23 04:41:28 +00:00
commit 2c385d9c13
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -7,7 +7,6 @@ install:
- sudo apt-get -y install autoconf-archive python-dev ruby1.8-dev libruby1.8 lua5.1 liblua5.1-0 - sudo apt-get -y install autoconf-archive python-dev ruby1.8-dev libruby1.8 lua5.1 liblua5.1-0
- sudo dpkg --get-selections | grep ruby - sudo dpkg --get-selections | grep ruby
- sudo dpkg --get-selections | grep lua - sudo dpkg --get-selections | grep lua
- ./bootstrap.sh
- git clone git://github.com/strophe/libstrophe.git - git clone git://github.com/strophe/libstrophe.git
- cd libstrophe - cd libstrophe
- ./bootstrap.sh - ./bootstrap.sh

2
README.md
View File

@ -1,4 +1,4 @@
Profanity Profanity [![Build Status](https://travis-ci.org/boothj5/profanity.png?branch=master)](https://travis-ci.org/boothj5/profanity)
========= =========
Profanity is a console based XMPP client inspired by [Irssi](http://www.irssi.org/), Profanity is a console based XMPP client inspired by [Irssi](http://www.irssi.org/),