Merge branch 'next'

1 files changed, 35 insertions, 37 deletions

diff --git a/.gitignore b/.gitignore
index 8eb4ebbb..5451d1e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,58 +1,38 @@
-.timestamp
+*.[oa]
 *.backup
 *.elc
+*.l[oa]
 *.pyc
 *~
+.timestamp
+/*.tar.bz2
+/*.tar.gz
+/.deps/
+/.libs/
 /ABOUT-NLS
+/BaselineTests
+/Doxyfile.gen
+/Makefile
 /Makefile.am
 /Makefile.in
+/PyUnitTests
+/RegressionTests
 /TAGS
 /acconf.h.in
 /aclocal.m4
 /autogen.sh
 /autom4te.cache/
 /config.guess
+/config.h
 /config.h.in
+/config.log
 /config.rpath
+/config.status
 /config.sub
 /configure
 /configure.ac
-/depcomp
-/elisp-comp
-/install-sh
-/intl/
-/ledger
-/ltmain.sh
-/m4/
-/make.sh
-/missing
-/po/
-/py-compile
-/src/system.hh.gch
-/texinfo.tex
-/version.m4
-
-*.[oa]
-*.l[oa]
-/*.tar.bz2
-/*.tar.gz
-/.deps/
-/.libs/
-/BaselineTests
-/Doxyfile.gen
-/Makefile
-/PyUnitTests
-/RegressionTests
-/config.h
-/config.log
-/config.status
 /data_tests
-/doc/.dirstamp
-/doc/html/
-/doc/latex/
-/doc/ledger.info
-/doc/refman.pdf
-/doc/report/
+/depcomp
 /doc/*.aux
 /doc/*.cp
 /doc/*.fn
@@ -63,15 +43,33 @@
 /doc/*.toc
 /doc/*.tp
 /doc/*.vr
+/doc/.dirstamp
+/doc/html/
+/doc/latex/
+/doc/ledger.info
+/doc/refman.pdf
+/doc/report/
+/elisp-comp
 /expr_tests
+/install-sh
+/intl/
+/ledger
 /libtool
+/ltmain.sh
+/m4/
+/make.sh
 /math_tests
+/missing
+/mkinstalldirs
+/po/
+/py-compile
 /report_tests
 /shave
 /shave-libtool
+/src/system.hh.gch
 /stamp-h1
 /test/python/
+/texinfo.tex
 /tmpcvs*/
 /tmpwrk*/
 /util_tests
-/mkinstalldirs