Merge branch 'master' into otr

This commit is contained in:
James Booth
2014-01-08 20:50:00 +00:00
7 changed files with 77 additions and 131 deletions

1
.gitignore vendored
View File

@@ -42,3 +42,4 @@ libprofanity.la
libtool
runvalgrind.sh
src/prof_config.h
clean.sh