Merge remote branch 'jrmuizel/master'
authorBehdad Esfahbod <behdad@behdad.org>
Tue, 4 May 2010 02:46:52 +0000 (22:46 -0400)
committerBehdad Esfahbod <behdad@behdad.org>
Tue, 4 May 2010 02:46:52 +0000 (22:46 -0400)
commit6b84198f9d471defb6f55d44d4f5423df70b2a10
treeed1839c2847240550c1ba66ffbe912ee68eef64e
parent631d10b728d9e1a02c7dddf505d4fae5e244c6e8
parenteaf29edb8fa49390e5f48b78105dfd173aff445b
Merge remote branch 'jrmuizel/master'
src/hb-open-file-private.hh
src/hb-open-type-private.hh