Merge branch 'mk/old-expat'
commitbfc1f6a1c18b3b0eba7e9126fb0b2688f865a110
authorJunio C Hamano <gitster@pobox.com>
Fri, 15 Feb 2013 00:06:08 +0000 (14 16:06 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 15 Feb 2013 00:06:08 +0000 (14 16:06 -0800)
tree3cc558797c0996131e26d0a3bb3d6f0f96e5638b
parentc0acef9b8ae84e7f67a1c231eb97ecfd897c5651
parent081fd8d093887b0cc5055d8a191ae2c26274846b
Merge branch 'mk/old-expat'

* mk/old-expat:
  Allow building with xmlparse.h
Makefile