Merge branch 'master' into readline

This commit is contained in:
James Booth
2015-03-04 22:38:32 +00:00

1
.gitignore vendored
View File

@@ -5,6 +5,7 @@
# *.[oa] # *.[oa]
# *~ # *~
profanity profanity
profanity.sh
*.o *.o
*.log *.log
*.swp *.swp