]> git.wh0rd.org Git - fontconfig.git/commit
Merge branch 'fc-2_4_branch' to master
authorKeith Packard <keithp@neko.keithp.com>
Sun, 3 Sep 2006 23:07:11 +0000 (16:07 -0700)
committerKeith Packard <keithp@neko.keithp.com>
Sun, 3 Sep 2006 23:07:11 +0000 (16:07 -0700)
commit822ec78c54a24a0f1589154ac2d4906b02b111ef
tree2ef5b875cd6db3f9b2f93b0186e2a9d1a9cc2147
parente79c648c7a27a1afdde813105d0727e3ee6bc9fd
parentfb2092c18fbf4af69e2cbafc265c4b0ad7e54346
Merge branch 'fc-2_4_branch' to master

Moving development back to master.