merge trunk rev : 25663 and 25664 to 0.3.1 branch - update freetype, take care of...
authorMagnus Olsen <magnus@greatlord.com>
Wed, 31 Jan 2007 17:07:19 +0000 (17:07 +0000)
committerMagnus Olsen <magnus@greatlord.com>
Wed, 31 Jan 2007 17:07:19 +0000 (17:07 +0000)
commit176b0cdbe8b085a4f0a06924d7000de5dff839b0
tree2fe9168788c1da194e3286832da32e630f2a601c
parent5e2f2fafad927f1fa238e09d4102a0c7da04901a
parent7d26f5efb9a018f9968098ac03d6c6520f2598a5
merge trunk rev : 25663 and 25664 to 0.3.1 branch - update freetype, take care of a segment fualt I getting in vmware

svn path=/branches/ros-branch-0_3_1/; revision=25666