summaryrefslogtreecommitdiffstats
path: root/examples/widgets/scribble/main.cpp
diff options
context:
space:
mode:
authorJason Barron <jbarron@trolltech.com>2009-08-21 08:57:24 (GMT)
committerJason Barron <jbarron@trolltech.com>2009-08-21 08:57:24 (GMT)
commit49c5acd406f5d2607b7a66d38d6279aa8c78f7f9 (patch)
treef45126f94631d128a05817e8179ebbaaa607df60 /examples/widgets/scribble/main.cpp
parenta44894a39113e0eb9d4f7c912eee4671b3f391c1 (diff)
parent8280ed177d798aeaf82868ba6c7c8c4250051f1d (diff)
downloadQt-49c5acd406f5d2607b7a66d38d6279aa8c78f7f9.zip
Qt-49c5acd406f5d2607b7a66d38d6279aa8c78f7f9.tar.gz
Qt-49c5acd406f5d2607b7a66d38d6279aa8c78f7f9.tar.bz2
Merge commit 'qt/master'
Conflicts: examples/graphicsview/graphicsview.pro
Diffstat (limited to 'examples/widgets/scribble/main.cpp')
0 files changed, 0 insertions, 0 deletions