diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-04-14 12:39:31 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-04-14 12:39:31 +0200 |
| commit | dc3c156cac62262233ffc9f4aaa4b4a6245b66a6 (patch) | |
| tree | 909ab45d0564034c7099d2b822943b5f621e6281 /src/plugins/qmldesigner/meegoplugin/images/buttoncolumn16.png | |
| parent | 4d69c7455e75f874e374651a1d00574a5075e845 (diff) | |
| parent | da0e926a414660240443a204efbb349b01bba912 (diff) | |
| download | qt-creator-dc3c156cac62262233ffc9f4aaa4b4a6245b66a6.tar.gz | |
Merge branch '2.2'
Conflicts:
src/plugins/debugger/gdb/pythongdbengine.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
src/plugins/qt4projectmanager/qt4target.cpp
src/plugins/qt4projectmanager/qt4target.h
src/plugins/qt4projectmanager/qtoptionspage.h
src/plugins/qt4projectmanager/qtversionmanager.cpp
src/plugins/welcome/welcomemode.cpp
Diffstat (limited to 'src/plugins/qmldesigner/meegoplugin/images/buttoncolumn16.png')
| -rw-r--r-- | src/plugins/qmldesigner/meegoplugin/images/buttoncolumn16.png | bin | 0 -> 3166 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/src/plugins/qmldesigner/meegoplugin/images/buttoncolumn16.png b/src/plugins/qmldesigner/meegoplugin/images/buttoncolumn16.png Binary files differnew file mode 100644 index 0000000000..883258048f --- /dev/null +++ b/src/plugins/qmldesigner/meegoplugin/images/buttoncolumn16.png |