Merge
commit11069eb6013d704c925fd397e23e7c8f01331b53
authorJorge Cuadrado <kuadrosxx@gmail.com>
Fri, 28 Sep 2007 14:19:33 +0000 (28 09:19 -0500)
committerJorge Cuadrado <kuadrosxx@gmail.com>
Fri, 28 Sep 2007 14:19:33 +0000 (28 09:19 -0500)
tree79be9c123e88588047426d57fc480aad88f906b2
parent1df946e39de354c4ee20f96ef5d84dc42ed8d898
parentfc32dfbc38084361ca52cd23143925c598f5610b
Merge
examples/tools/mainwindow.cpp
yamf/tools/geometric/geometric.cpp
yamf/tools/text/text.cpp