diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-09 12:15:59 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 12:44:43 +0100 |
| commit | 3146dcbdc768c90a03b58eed3f42630604443093 (patch) | |
| tree | 10e234460c5f57012b346cdbe6304002ad0a446d /examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics | |
| parent | a7ea2afffd61e2a89f7bb2c586b4b733c4996bb5 (diff) | |
| parent | 722725cf24e45e86a2844810b90787a29df8a4a9 (diff) | |
Merge branch 'stable' into dev
Conflicts:
sync.profile
tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
Change-Id: I3620d15b4163fec420d18f6be50cae1635b99a2f
Diffstat (limited to 'examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics')
12 files changed, 0 insertions, 0 deletions
diff --git a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/back.png b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/back.png Binary files differnew file mode 100644 index 00000000..f6b3f0b4 --- /dev/null +++ b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/back.png diff --git a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/background.png b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/background.png Binary files differnew file mode 100644 index 00000000..3734a277 --- /dev/null +++ b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/background.png diff --git a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/bomb-color.png b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/bomb-color.png Binary files differnew file mode 100644 index 00000000..61ad0a92 --- /dev/null +++ b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/bomb-color.png diff --git a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/bomb.png b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/bomb.png Binary files differnew file mode 100644 index 00000000..a9925755 --- /dev/null +++ b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/bomb.png diff --git a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-sad.png b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-sad.png Binary files differnew file mode 100644 index 00000000..cf00aafe --- /dev/null +++ b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-sad.png diff --git a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-smile-big.png b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-smile-big.png Binary files differnew file mode 100644 index 00000000..f9c2335d --- /dev/null +++ b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-smile-big.png diff --git a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-smile.png b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-smile.png Binary files differnew file mode 100644 index 00000000..3d66d725 --- /dev/null +++ b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-smile.png diff --git a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/flag-color.png b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/flag-color.png Binary files differnew file mode 100644 index 00000000..aadad0f1 --- /dev/null +++ b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/flag-color.png diff --git a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/flag.png b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/flag.png Binary files differnew file mode 100644 index 00000000..39cde4df --- /dev/null +++ b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/flag.png diff --git a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/front.png b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/front.png Binary files differnew file mode 100644 index 00000000..834331bd --- /dev/null +++ b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/front.png diff --git a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/quit.png b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/quit.png Binary files differnew file mode 100644 index 00000000..b822057d --- /dev/null +++ b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/quit.png diff --git a/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/star.png b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/star.png Binary files differnew file mode 100644 index 00000000..37723591 --- /dev/null +++ b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/star.png |
