diff options
author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-06-27 12:27:54 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-06-27 12:27:54 +0200 |
commit | 18a3f6169bb8a763366003d92b8013950578c79f (patch) | |
tree | e39fa00a9511410fea9be35a6130007e43719ad8 /examples/tools/undo/icons | |
parent | 371d398f70e10408e0eaba7b5f05e638a0048599 (diff) | |
parent | a06c8405d053b16327d65415f3335eceb37abd3b (diff) |
Merge remote-tracking branch 'base/master' into refactor
Conflicts:
demos/demos.pro
demos/embedded/digiflip/digiflip.pro
examples/examples.pro
examples/graphicsview/embeddeddialogs/embeddeddialogs.pro
src/gui/kernel/qplatformglcontext_qpa.cpp
src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp
src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp
src/plugins/platforms/wayland/qwaylanddisplay.cpp
src/plugins/platforms/wayland/qwaylandwindow.cpp
Change-Id: I2a4ec9e2ca9c9aa9d57b55f98985e810b77bb745
Diffstat (limited to 'examples/tools/undo/icons')
16 files changed, 0 insertions, 0 deletions
diff --git a/examples/tools/undo/icons/background.png b/examples/tools/undo/icons/background.png Binary files differnew file mode 100644 index 0000000000..3bc5ed8cf0 --- /dev/null +++ b/examples/tools/undo/icons/background.png diff --git a/examples/tools/undo/icons/blue.png b/examples/tools/undo/icons/blue.png Binary files differnew file mode 100644 index 0000000000..4e181bb61a --- /dev/null +++ b/examples/tools/undo/icons/blue.png diff --git a/examples/tools/undo/icons/circle.png b/examples/tools/undo/icons/circle.png Binary files differnew file mode 100644 index 0000000000..ed16c6e144 --- /dev/null +++ b/examples/tools/undo/icons/circle.png diff --git a/examples/tools/undo/icons/exit.png b/examples/tools/undo/icons/exit.png Binary files differnew file mode 100644 index 0000000000..539cb2ead9 --- /dev/null +++ b/examples/tools/undo/icons/exit.png diff --git a/examples/tools/undo/icons/fileclose.png b/examples/tools/undo/icons/fileclose.png Binary files differnew file mode 100644 index 0000000000..c5483d14ab --- /dev/null +++ b/examples/tools/undo/icons/fileclose.png diff --git a/examples/tools/undo/icons/filenew.png b/examples/tools/undo/icons/filenew.png Binary files differnew file mode 100644 index 0000000000..57e57e343b --- /dev/null +++ b/examples/tools/undo/icons/filenew.png diff --git a/examples/tools/undo/icons/fileopen.png b/examples/tools/undo/icons/fileopen.png Binary files differnew file mode 100644 index 0000000000..33e0d6394c --- /dev/null +++ b/examples/tools/undo/icons/fileopen.png diff --git a/examples/tools/undo/icons/filesave.png b/examples/tools/undo/icons/filesave.png Binary files differnew file mode 100644 index 0000000000..57fd5e2f34 --- /dev/null +++ b/examples/tools/undo/icons/filesave.png diff --git a/examples/tools/undo/icons/green.png b/examples/tools/undo/icons/green.png Binary files differnew file mode 100644 index 0000000000..e2e7cc9e50 --- /dev/null +++ b/examples/tools/undo/icons/green.png diff --git a/examples/tools/undo/icons/ok.png b/examples/tools/undo/icons/ok.png Binary files differnew file mode 100644 index 0000000000..e355ea91bc --- /dev/null +++ b/examples/tools/undo/icons/ok.png diff --git a/examples/tools/undo/icons/rectangle.png b/examples/tools/undo/icons/rectangle.png Binary files differnew file mode 100644 index 0000000000..3a7d9795fd --- /dev/null +++ b/examples/tools/undo/icons/rectangle.png diff --git a/examples/tools/undo/icons/red.png b/examples/tools/undo/icons/red.png Binary files differnew file mode 100644 index 0000000000..58c3e7253b --- /dev/null +++ b/examples/tools/undo/icons/red.png diff --git a/examples/tools/undo/icons/redo.png b/examples/tools/undo/icons/redo.png Binary files differnew file mode 100644 index 0000000000..5591517e1c --- /dev/null +++ b/examples/tools/undo/icons/redo.png diff --git a/examples/tools/undo/icons/remove.png b/examples/tools/undo/icons/remove.png Binary files differnew file mode 100644 index 0000000000..7a7b048c0a --- /dev/null +++ b/examples/tools/undo/icons/remove.png diff --git a/examples/tools/undo/icons/triangle.png b/examples/tools/undo/icons/triangle.png Binary files differnew file mode 100644 index 0000000000..2969131c31 --- /dev/null +++ b/examples/tools/undo/icons/triangle.png diff --git a/examples/tools/undo/icons/undo.png b/examples/tools/undo/icons/undo.png Binary files differnew file mode 100644 index 0000000000..8cf63a8ec9 --- /dev/null +++ b/examples/tools/undo/icons/undo.png |