diff options
| author | Kalle Viironen <kalle.viironen@digia.com> | 2014-05-26 13:51:28 +0300 |
|---|---|---|
| committer | Kalle Viironen <kalle.viironen@digia.com> | 2014-05-26 13:51:36 +0300 |
| commit | c7edfa22fadbb5041b8dee1d5cd27adfcfb7f833 (patch) | |
| tree | 8207705ee648774ed7e6a5922e4f0ab3ca2aa976 /tradeshow/multipointtouch/content/blur-circle3.png | |
| parent | d757a8ee2d86c3f4b694f8fdff5defa7b0dbab75 (diff) | |
| parent | 536f2ed4438a1e04aeed372d08c46811603f5018 (diff) | |
Merge branch 'stable' into releaseQtEE_v3.0.0
* stable: (28 commits)
webengine demo: rearrange layout to make all links visible on iMX6
webengine demo: add predefined links to page view
Fix webengine demo to hide home screen when adressbar is accepted
webengine demo: disable the pageview when it's hidden
Hide the webengine demo on the new nexus7
Add local CSS tetrahedron example and home page to webengine demo
Disable webengine demo on beaglebone and pi
[launchersettings] Add boundaries for signal strength bar.
Also deploy webengine demo local content
Display an error message if WebGL is not supported.
Add a simple WebEngine demo to the B2Qt basicsuite
Exclude qtdatavis3d from android-beaglebone
Disable autocompletion for password field
workaround for crash on linux
Camera demo doesn't work on new nexus just yet, exclude it
Remove yocto version from about-b2qt demo
remove datavis 3D from RPi launher demos
Fix typo in came exclude
Use consistent title naming
Remove non functional demos from i.MX6 SABRE SD launcher demo set
...
Change-Id: Ib08aba9f746c6f233090d79c38243caa657bf9be
Diffstat (limited to 'tradeshow/multipointtouch/content/blur-circle3.png')
| -rw-r--r-- | tradeshow/multipointtouch/content/blur-circle3.png | bin | 0 -> 5148 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/tradeshow/multipointtouch/content/blur-circle3.png b/tradeshow/multipointtouch/content/blur-circle3.png Binary files differnew file mode 100644 index 0000000..dbc39cb --- /dev/null +++ b/tradeshow/multipointtouch/content/blur-circle3.png |