]> git.wh0rd.org - fontconfig.git/commitdiff
git.wh0rd.org / fontconfig.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e79c648 fb2092c)
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)
Moving development back to master.


Trivial merge
http://fontconfig.org/