Merge branch 'develop' into release/1.8.0

Conflicts: ChangeLog src/patch.h
eggheads · Nov 2, 2016 · e72334e · e72334e
2 parents c5016d7 + d469046
commit e72334e
Show file tree

Hide file tree

Showing 148 changed files with 2,756 additions and 16,422 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,3 +26,15 @@ _$*
 *.ln
 core
 # CVS default ignores end
+autom4te.cache
+Makefile
+.modules
+.known_modules
+config.h
+lush.h
+config.log
+config.status
+config.cache
+eggdrop
+EGGMOD.stamp
+mod.xlibs