diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-29 01:01:07 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-29 01:01:07 (GMT) |
| commit | b3d030df07ba59059e3d6ecf6e1967cbf1f30d49 (patch) | |
| tree | e0a939a1381c2b983c7fdc79c5f116f87b3a3bc6 /demos/sub-attaq/pics/big/boat.png | |
| parent | 93ad359f93de72ef8c4d5f0073dc20ba22b9023c (diff) | |
| parent | a6ea9ce6990003856ecadcca8ce9ddf37949363d (diff) | |
| download | Qt-b3d030df07ba59059e3d6ecf6e1967cbf1f30d49.zip Qt-b3d030df07ba59059e3d6ecf6e1967cbf1f30d49.tar.gz Qt-b3d030df07ba59059e3d6ecf6e1967cbf1f30d49.tar.bz2 | |
Merge branch 'master' of ../qt into kinetic-declarativeui
Conflicts:
configure.exe
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/widgets/qlineedit.cpp
Diffstat (limited to 'demos/sub-attaq/pics/big/boat.png')
| -rw-r--r-- | demos/sub-attaq/pics/big/boat.png | bin | 0 -> 5198 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/demos/sub-attaq/pics/big/boat.png b/demos/sub-attaq/pics/big/boat.png Binary files differnew file mode 100644 index 0000000..be82dff --- /dev/null +++ b/demos/sub-attaq/pics/big/boat.png |