Merge branch 'master' into v2.7a

This commit is contained in:
John Wiegley 2008-07-23 15:56:31 -04:00
commit 90af218524
2 changed files with 2 additions and 1 deletions

1
.gitignore vendored
View file

@ -12,6 +12,7 @@
/.libs /.libs
/AUTHORS /AUTHORS
/COPYING /COPYING
/ChangeLog
/Makefile /Makefile
/Makefile.in /Makefile.in
/TAGS /TAGS

2
acprep
View file

@ -12,7 +12,7 @@
export AUTOCONF_VERSION=2.61 export AUTOCONF_VERSION=2.61
export AUTOMAKE_VERSION=1.9 export AUTOMAKE_VERSION=1.9
touch AUTHORS COPYING touch AUTHORS COPYING ChangeLog
cmd=$(which glibtoolize 2>&1) cmd=$(which glibtoolize 2>&1)
if [ -x "$cmd" ]; then if [ -x "$cmd" ]; then