Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
commitbff554a0045faf04092c5e7af418294e549a8418
authorJakub Narebski <jnareb@gmail.com>
Sat, 9 Sep 2006 08:26:52 +0000 (9 10:26 +0200)
committerJakub Narebski <jnareb@gmail.com>
Sat, 9 Sep 2006 08:26:52 +0000 (9 10:26 +0200)
treed23ca90d881d9f1138ba8c61fa01ad8515e823ad
parent53a7834b34dcd49d308091d2b9a7d05cb25ac2f7
parent2878836c5074be92b913c95446b94bbf1c9a9e1d
Merge branch 'master' of git://git./git/git

* 'master' of git://git.kernel.org/pub/scm/git/git:
  autoconf: Add config.cache to .gitignore
  autoconf: Add support for setting NO_ICONV and ICONVDIR
  autoconf: Set NO_ICONV if iconv is found neither in libc, nor in libiconv