Merge branch 'master' of git://gitorious.org/webos-internals/applications
authorVaughn Cato <vaughn@vaughn2.localdomain>
Fri, 24 Jul 2009 04:38:41 +0000 (00:38 -0400)
committerVaughn Cato <vaughn@vaughn2.localdomain>
Fri, 24 Jul 2009 04:38:41 +0000 (00:38 -0400)
commitbdeebf029f2865dd4544b7190ed62649e015ebd4
tree8265c0bfcfeb428be6fac3328ac9d81c54827fa3
parent6d7e2c041c1f440aad1216c0753f2d387b894f61
parent3ffd3be4a9cdff2ae6ad35f9f68e0ae6e3359009
Merge branch 'master' of git://gitorious.org/webos-internals/applications

Conflicts:
termplugin/fontinfo.cpp
termplugin/fontinfo.hpp