Merge branch 'master' into otr

Conflicts: .gitignore
2014-01-05 01:20:42 +00:00
parent e504c030a6 5898da963a
commit f569845b40
7 changed files with 498 additions and 32 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,10 @@ plugins/
 src/gitversion.c
 *_key.txt
 *_fingerprints.txt
+TAGS
+.libs/
+_configs.sed
+libprofanity.la
+libtool
+runvalgrind.sh
+src/prof_config.h