]> Pileus Git - ~andy/git/commit
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sat, 26 Dec 2009 22:33:05 +0000 (14:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 26 Dec 2009 22:33:05 +0000 (14:33 -0800)
commit1d85dd6fb2d5a05493dd11c6fb77ef2c04c79f43
treeef21341598075406f1488c9a023f40798d1236f8
parent68b890a8d5aab897f392928105596de85cc9135e
parent21a0d9b42d9cc9560c66fb3cfa82a2a449de8b39
Merge branch 'maint'

* maint:
  Makefile: FreeBSD (both 7 and 8) needs OLD_ICONV
  Start 1.6.6.X maintenance track
  Add git-http-backend to command-list.
  t4019 "grep" portability fix
  t1200: work around a bug in some implementations of "find"

Conflicts:
RelNotes
Makefile