]> git.wh0rd.org - fontconfig.git/commitdiff
Merge branch 'jhcloos'
authorKeith Packard <keithp@neko.keithp.com>
Sat, 9 Sep 2006 22:49:24 +0000 (15:49 -0700)
committerKeith Packard <keithp@neko.keithp.com>
Sat, 9 Sep 2006 22:49:24 +0000 (15:49 -0700)
1  2 
Makefile.am
configure.in

diff --cc Makefile.am
Simple merge
diff --cc configure.in
Simple merge