Andrew Poor [Thu, 11 Aug 2016 10:53:34 +0000 (11:53 +0100)]
Mesh visual buttons change.
Change-Id: I32ed8eb68cd099fc329a93fc6c370a4caada32a0
Seoyeon Kim [Fri, 12 Aug 2016 08:42:15 +0000 (17:42 +0900)]
Translate the dali-demo titile in Korean
Change-Id: I265e610f934b4d3515429c55461d42f654d94b81
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Nick Holland [Fri, 12 Aug 2016 10:41:11 +0000 (11:41 +0100)]
DALi Version 1.2.1
Change-Id: I3a93d7b534c95579f4b8a5d45be398595fc5de6b
Xiangyin Ma [Mon, 8 Aug 2016 14:00:01 +0000 (15:00 +0100)]
Modify PixelArea example to demostrate wrap mode usage
Change-Id: Id4c3dc76f5eeb048ff78a6cd77ab87e845f29dc8
Adeel Kazmi [Fri, 5 Aug 2016 15:46:48 +0000 (08:46 -0700)]
Merge "Added a simple application for testing Styling" into devel/master
Tom Robinson [Fri, 5 Aug 2016 13:52:18 +0000 (14:52 +0100)]
DALi Version 1.2.0
Change-Id: If90a93fd7eef1e64292e29b696c80777fd431e95
David Steele [Mon, 16 May 2016 13:00:45 +0000 (14:00 +0100)]
Added a simple application for testing Styling
Added a simple application that has examples of different button
types, sliders and popups, that can all be themed.
Change-Id: I6d74357b79def0c8d0f7195adf0be7c1270fe9ce
Signed-off-by: David Steele <david.steele@samsung.com>
Adeel Kazmi [Thu, 4 Aug 2016 15:59:47 +0000 (08:59 -0700)]
Merge "Updated demos to remove indicator where appropriate" into devel/master
Adeel Kazmi [Thu, 4 Aug 2016 15:51:54 +0000 (08:51 -0700)]
Merge "Moved po directory to resources folder & added missing language strings" into devel/master
David Steele [Thu, 4 Aug 2016 15:15:19 +0000 (16:15 +0100)]
Updated demos to remove indicator where appropriate
Removed indicator from demo toolbar, and from other examples that
don't use toolbar and have a UI at the top of the display.
Change-Id: Ifd3b3c5f916f249f492ff154a0ca28054763ee6e
Signed-off-by: David Steele <david.steele@samsung.com>
adam.b [Thu, 4 Aug 2016 13:47:15 +0000 (14:47 +0100)]
Batching clean-up
BATCHING_ENABLED property has been moved to ImageVisual
Change-Id: Ib720deb1722f8959ba2f182babc888321fe70ca5
Adeel Kazmi [Thu, 4 Aug 2016 12:24:26 +0000 (13:24 +0100)]
Moved po directory to resources folder & added missing language strings
Change-Id: Id1199bdf7c72614c9fdb27c16e235b59e0206d04
David Steele [Tue, 2 Aug 2016 10:21:53 +0000 (11:21 +0100)]
Updated internationalized strings
Change-Id: I659445f2e0d7d1193abdf1e5b15035cdb401e2e3
Signed-off-by: David Steele <david.steele@samsung.com>
Signed-off-by: Adeel Kazmi <adeel.kazmi@samsung.com>
Paul Wisbey [Wed, 3 Aug 2016 16:01:28 +0000 (09:01 -0700)]
Merge "Geometry Batching" into devel/master
Tom Robinson [Mon, 1 Aug 2016 18:04:59 +0000 (19:04 +0100)]
Geometry Batching
A reduction in GL calls can be observed when running the example with the following options for comparison:
DALI_GLES_CALL_TIME=1 DALI_GLES_CALL_TIME_ACCUMULATE=1 homescreen-benchmark.example –disable-icon-labels
&
DALI_GLES_CALL_TIME=1 DALI_GLES_CALL_TIME_ACCUMULATE=1 homescreen-benchmark.example –disable-icon-labels –disable-batching
W/O Batching W/ Batching % Improvement
Bind buffers 0.00 11.88 N/A
Bind textures 4.03 5.6 -26%
Draw calls 27.31 10.06 +63%
Uniform sets 53.88 10.06 +81%
Note: Larger improvements can be seen when the bottleneck is within the Render thread (instead of Update).
Change-Id: I294665299f2d7d8149563f1ea7fed730aed53da6
Paul Wisbey [Tue, 2 Aug 2016 16:51:36 +0000 (09:51 -0700)]
Merge "Stencil Renderer demo: Toolbar removed" into devel/master
Tom Robinson [Fri, 29 Jul 2016 15:30:36 +0000 (16:30 +0100)]
Stencil Renderer demo: Toolbar removed
Change-Id: I0e61ab6668a28c000571b957e482f1845c3705be
Victor Cebollada [Thu, 21 Jul 2016 10:46:03 +0000 (11:46 +0100)]
TextEditor - Update the decoration box's size.
* Sets the decoration bounding box the size of the text-editor control.
This prevents the popup to be positioned on top of the virtual keyboard
or the top bar.
Change-Id: I317d2289e740725b8e39746feeccad5ff664827e
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Andrew Poor [Wed, 27 Jul 2016 08:58:47 +0000 (09:58 +0100)]
Mesh demo improvements for lighting.
Change-Id: I6fb94272f1fc562b210c765d79f217d40a611263
Adeel Kazmi [Fri, 29 Jul 2016 16:12:16 +0000 (17:12 +0100)]
DALi Version 1.1.45
Change-Id: I2c8685ce577c9174057cd4917388a3c620e0777e
Adeel Kazmi [Wed, 27 Jul 2016 09:48:12 +0000 (10:48 +0100)]
Updates following Visual Property Changes
Change-Id: Ie5d0a5aa32a0fcee1448f4fb69277d4476048fdd
Tom Robinson [Thu, 28 Jul 2016 13:18:36 +0000 (14:18 +0100)]
FrameBuffer::Format changed to bit-mask Attachment: Demo
Change-Id: Ia6f1c7db32069f80bcaecd562dd487f65702ae22
Ferran Sole [Wed, 27 Jul 2016 16:16:44 +0000 (17:16 +0100)]
Changes following dali-core patch "Renamed enum Geometry::GeometryType to Geometry::Type"
Change-Id: I6deb28113e55870148a50eea68bb86b3cdc7c014
Tom Robinson [Wed, 20 Jul 2016 10:01:25 +0000 (11:01 +0100)]
Rendering API Stencil Implementation: Demo
Change-Id: I36c8f31b4154d743919019d0059db748b1d05e2d
Agnelo Vaz [Mon, 25 Jul 2016 13:17:10 +0000 (14:17 +0100)]
Model3DView does not need to set IMAGES_URL when changing model
Change-Id: I8db72bdd61641363dae9548554cdf12c76563a0c
Adeel Kazmi [Fri, 22 Jul 2016 16:14:30 +0000 (09:14 -0700)]
Merge "Tizen Directory Migration" into devel/master
Adeel Kazmi [Fri, 22 Jul 2016 16:08:56 +0000 (09:08 -0700)]
Merge "Added support for setting light position in mesh renderer." into devel/master
Adeel Kazmi [Fri, 22 Jul 2016 16:06:23 +0000 (09:06 -0700)]
Merge "DALi Version 1.1.44" into devel/master
Richard Huang [Fri, 22 Jul 2016 16:00:40 +0000 (17:00 +0100)]
DALi Version 1.1.44
Change-Id: Id4714421a864f5d820ab9095a93c704750fe1394
Andrew Poor [Thu, 7 Jul 2016 14:00:01 +0000 (15:00 +0100)]
Added support for setting light position in mesh renderer.
Change-Id: I1d0298c1e0cd30ac370bc27f45ffe0ade5d2d616
Andrew Poor [Fri, 22 Jul 2016 13:32:03 +0000 (14:32 +0100)]
Normal-less objects now have their normals calculated so that they can be displayed correctly.
Change-Id: If1d7bd35eaba1cff82f12ea8118b35cf486cfb23
Agnelo Vaz [Thu, 21 Jul 2016 16:03:47 +0000 (17:03 +0100)]
Removing unused control renderer and factory header files
Change-Id: Ibf0a299acb09a87536d1847ca680ec97aac6e0a7
Andrew Poor [Thu, 2 Jun 2016 14:00:29 +0000 (15:00 +0100)]
Implemented a primitive shape renderer to display simple shapes like cubes.
Change-Id: I2431290a111de586f6440f58d17ffb5473f400bf
Adeel Kazmi [Tue, 19 Jul 2016 10:38:26 +0000 (11:38 +0100)]
Updates after Renderer Type values changed
Change-Id: I32c2aa4576413ba56bcdac4376b491125805b0f3
Adeel Kazmi [Mon, 18 Jul 2016 12:43:59 +0000 (13:43 +0100)]
Updates following enum changes to mesh and gradient renderer
Change-Id: I1a885d54a18113547b6af9bb1437d43c21a00de4
minho.sun [Mon, 4 Jul 2016 09:26:41 +0000 (18:26 +0900)]
Tizen Directory Migration
Change absolute Directories to Tizen paths
Change-Id: I1916835c8a53153663b227aa51f4c075d6d9eb5a
Signed-off-by: minho.sun <minho.sun@samsung.com>
David Steele [Fri, 15 Jul 2016 11:27:22 +0000 (12:27 +0100)]
DALi Version 1.1.43
Change-Id: I24b308353a1507ffd2acf12bd5fb5f1446a03c67
Tom Robinson [Wed, 13 Jul 2016 14:04:55 +0000 (15:04 +0100)]
Moved Core Rendering API from devel-api to public-api
Change-Id: I2f8676282ff622eba6f3fd67dd6db11c52d3c260
Tom Robinson [Mon, 11 Jul 2016 14:51:41 +0000 (15:51 +0100)]
Moved TextureSet::SetImage() to separate devel-api module
Change-Id: I801d127df7805fb8df6bbaa28fbfeeee46c898a6
Paul Wisbey [Mon, 11 Jul 2016 10:29:06 +0000 (03:29 -0700)]
Merge "Modified native image and compressed texture examples to use new texture." into devel/master
Xiangyin Ma [Fri, 8 Jul 2016 15:25:40 +0000 (16:25 +0100)]
Clean up more ResourceImage Usage
Change-Id: Iaefcd75232bb19ed72555960bea8732b34e07937
Adeel Kazmi [Fri, 8 Jul 2016 16:52:46 +0000 (09:52 -0700)]
Merge "DALi Version 1.1.42" into devel/master
Agnelo Vaz [Fri, 8 Jul 2016 16:43:49 +0000 (17:43 +0100)]
DALi Version 1.1.42
Change-Id: I2145b5caed787a23e96fa6c8bb1e955da3940555
Ferran Sole [Mon, 13 Jun 2016 09:42:34 +0000 (10:42 +0100)]
Modified native image and compressed texture examples to use new texture.
* Clean-up some demos to use utility function to create quad with texture coordinates
Change-Id: I35d71cabc4140bdda298c2975f1f682d72a94176
adam.b [Wed, 6 Jul 2016 16:11:57 +0000 (17:11 +0100)]
Replaced Image with Texture when using cube transition effect. All references to the Image type have been removed.
Change-Id: Ibc08cbaf72fa8f0f65bd434998adc17b9a9c7c64
Adeel Kazmi [Thu, 7 Jul 2016 09:01:53 +0000 (10:01 +0100)]
(Touch) Remove Usage of TouchEvent
Change-Id: Ie09429854a2dd9cd8aa9e4bc506f41cd41374f7f
Xiangyin Ma [Wed, 22 Jun 2016 17:36:42 +0000 (18:36 +0100)]
Remove ResourceImage usage from demos
Change-Id: I48be2cb5c069cfa59e768291b1c128567d5835e0
adam.b [Fri, 1 Jul 2016 13:28:56 +0000 (14:28 +0100)]
DALi Version 1.1.41
Change-Id: Ia63e74177bc97db37f9335e0395f06867e77e40e
Adeel Kazmi [Thu, 30 Jun 2016 11:46:09 +0000 (04:46 -0700)]
Merge "Mesh demo improvements." into devel/master
Andrew Poor [Wed, 29 Jun 2016 12:50:16 +0000 (13:50 +0100)]
Mesh demo improvements.
Change-Id: I605525a41398bedf5db8675719d4d32475517f03
Ferran Sole [Tue, 28 Jun 2016 15:56:40 +0000 (16:56 +0100)]
Changes following "Added support for compressed texture upload to Render::NewTexture"
Change-Id: I3d25317e94d22389e94b4afd91bebedaca23b5b9
Victor Cebollada [Fri, 24 Jun 2016 07:42:17 +0000 (08:42 +0100)]
DALi Version 1.1.40
Change-Id: If3b73c0ba23ecc9c0a6dbdd0d8bc08ae0f319439
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Andrew Poor [Thu, 2 Jun 2016 13:54:12 +0000 (14:54 +0100)]
Implemented a mesh renderer to display 3D objects from files.
Change-Id: I0a9992e6750db54c55f0e40c9e9005875aab6366
Adeel Kazmi [Fri, 17 Jun 2016 10:43:44 +0000 (11:43 +0100)]
DALi Version 1.1.39
Change-Id: Ib8835de4bd9a0ed029b3bfbc5c7151fe10f1fddc
Seoyeon Kim [Mon, 23 May 2016 10:28:02 +0000 (19:28 +0900)]
Updated demo following Slider move to the public API
Change-Id: I33bbf86c1ae35d8b55f4b5c3d8d83d27503c2ecc
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
taeyoon [Mon, 2 May 2016 04:44:19 +0000 (13:44 +0900)]
Sample for video view control
Add a sample for video view control
- Playback, custom shader
Change-Id: Ie1527d63f2cff681cac7405b0e45624028e1f095
Adeel Kazmi [Mon, 13 Jun 2016 09:52:54 +0000 (10:52 +0100)]
Use new touch signal & image-view URL specified as a string
Change-Id: Ied59238560a6e49f4ed60b437a0225cf07e425ea
Xiangyin Ma [Fri, 10 Jun 2016 10:48:29 +0000 (11:48 +0100)]
DALi Version 1.1.38
Change-Id: I95d6919dd7424729bc644f62824bbac515aebe20
Kimmo Hoikka [Fri, 3 Jun 2016 16:13:24 +0000 (09:13 -0700)]
Merge "Updata Atlas example following the PixelData change" into devel/master
Tom Robinson [Fri, 3 Jun 2016 13:33:47 +0000 (14:33 +0100)]
DALi Version 1.1.37
Change-Id: Iff23fa6ef913948b6e8deef296375c6cddde567e
Xiangyin Ma [Thu, 26 May 2016 15:54:12 +0000 (16:54 +0100)]
Updata Atlas example following the PixelData change
Change-Id: I3e37cc6dcfddc9cfc092b6b9aa68f9d4b932b71f
Paul Wisbey [Thu, 2 Jun 2016 17:03:08 +0000 (10:03 -0700)]
Merge "Simple TextEditor demo." into devel/master
Victor Cebollada [Thu, 2 Jun 2016 14:31:16 +0000 (15:31 +0100)]
Simple TextEditor demo.
Change-Id: I6d36b8cc0c9ca9ce91def537024b1fdb8ac94bf9
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Fri, 27 May 2016 16:07:19 +0000 (17:07 +0100)]
Use new TouchData API
Change-Id: Ia8cc676eeb95ec2673995026cddca8850693d04e
Richard Huang [Fri, 27 May 2016 11:21:18 +0000 (12:21 +0100)]
DALi Version 1.1.36
Change-Id: I58c976327fa95fc9e1273936e0545244f05261db
Xiangyin Ma [Mon, 23 May 2016 16:22:09 +0000 (17:22 +0100)]
Use sync image loading in text scrolling example
Change-Id: I1a9bd9116c491f158fd2a1bf64657a5123376407
Tom Robinson [Tue, 24 May 2016 15:03:12 +0000 (16:03 +0100)]
Allows debug builds to be enabled for GBS & Ubuntu builds
You can now enable a debug build of DALi via GBS by adding the following to your GBS build line:
--define "%enable_debug 1"
Details in README file.
Change-Id: Ie587690ac1871d17905e83b70ce251d64f88dff2
Nick Holland [Fri, 20 May 2016 10:17:50 +0000 (11:17 +0100)]
DALi Version 1.1.35
Change-Id: If8b46cadc3ef249ad52da2c0b92618717e9f0cc4
Richard Huang [Tue, 10 May 2016 15:17:19 +0000 (16:17 +0100)]
Make FlexContainer as public API
Change-Id: Id10551f78b22606e3e9002bda5f508feeaae1e47
Richard Huang [Wed, 18 May 2016 12:23:56 +0000 (13:23 +0100)]
Support for child properties registration in FlexContainer
Change-Id: I12e45bcce115a5e78ca60bf88b1183f2bdebe873
Adeel Kazmi [Fri, 13 May 2016 14:35:01 +0000 (07:35 -0700)]
Merge "Text Message Field example changed to a Text Scrolling demo" into devel/master
Agnelo Vaz [Tue, 10 May 2016 09:12:24 +0000 (10:12 +0100)]
Text Message Field example changed to a Text Scrolling demo
Shows text labels scrolling with large/small text and rtl and ltr text.
TextField can scroll to top of screen, demonstrates the Popup positioning when space restricted
Change-Id: I48b2f4b1510ff1b7cc0d13dcccb8ead516c2772c
Ferran Sole [Fri, 13 May 2016 10:54:59 +0000 (11:54 +0100)]
DALi Version 1.1.34
Change-Id: I7cd9fef39a259a267b577e2e877f3a324f400390
Victor Cebollada [Thu, 12 May 2016 08:28:49 +0000 (09:28 +0100)]
ItemView - Shows how to use the "stopScrolling" action.
* Do a long press on the item-view.
* The item-view will scroll towards the last item for 5 seconds
if the touch point is in the bottom half of the screen or to
the first item otherwise.
* If the long press is cancelled, the animation finishes.
Change-Id: I523bc992953d3d3a0ba3bd292598b77042955cdf
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
David Steele [Fri, 6 May 2016 14:47:35 +0000 (15:47 +0100)]
DALi Version 1.1.33
Change-Id: Idd1a1e272dadcb1719f4b7f31536e00e91276264
Paul Wisbey [Fri, 22 Apr 2016 13:04:01 +0000 (14:04 +0100)]
Blending enum clean-up
We were previously using a mixture of BLEND and BLENDING in enums.
The order of the BLEND_FACTOR enums & string names was also inconsistent.
As a rule of thumb always use Blend & BLEND for namespaces & enums/constants
(not Blending or BLENDING)
Change-Id: Ia4dd6483edc56e9736436e7aa8545b40f999ba47
Agnelo Vaz [Fri, 29 Apr 2016 08:10:56 +0000 (09:10 +0100)]
DALi Version 1.1.32
Change-Id: Icda20718f0353032008902e333192863d5e7d3f5
Adeel Kazmi [Thu, 28 Apr 2016 12:42:01 +0000 (05:42 -0700)]
Merge "Updated demos following StyleManager move to the public API" into devel/master
Xiangyin Ma [Mon, 18 Apr 2016 17:48:57 +0000 (18:48 +0100)]
Stop using ImageActor in Json files
Change-Id: Ia032845f8db6dc457b940500c453930e8b588207
Adam Bialogonski [Tue, 19 Apr 2016 15:10:28 +0000 (16:10 +0100)]
line-mesh-demo using setIndexRange(). When changing mode it doesn't recreate the index buffer, but changes the range of indices to draw and the type of primitives.
added interface to modify number of used elements from the elements array.
Change-Id: If0b223e6ace3d64aae8f16af0a284a42a7c9d967
David Steele [Tue, 26 Apr 2016 14:23:07 +0000 (15:23 +0100)]
Updated demos following StyleManager move to the public API
Change-Id: I988e00a3a2d36ec6f9f9341443c500f03aa70c72
Signed-off-by: David Steele <david.steele@samsung.com>
Ferran Sole [Wed, 20 Apr 2016 15:11:56 +0000 (16:11 +0100)]
Changes following "Remove geometry scvene object"
Change-Id: I8138d652252f76ef24becc0fcfce3cef15321cad
Xiangyin Ma [Thu, 21 Apr 2016 16:15:23 +0000 (17:15 +0100)]
update following the changes of the ControlRenderer property names
Change-Id: I2aea5bcde8b3a1a4b2bebdcb9ad525ed87a9847a
Adeel Kazmi [Fri, 22 Apr 2016 09:08:06 +0000 (10:08 +0100)]
DALi Version 1.1.31
Change-Id: I8321e948b6f85990f62c98855bfde433045f432e
taeyoon [Wed, 20 Apr 2016 04:20:21 +0000 (13:20 +0900)]
Working... Add missed tag and fix launch issue
- Fix mismatch between <ui...> and </ui..>
- Add DALI_EXPORT_API
TODO> Example launch issue in dali-demo
Change-Id: I3c685d79c725e08d3798eb9e906734effd1a2fd0
minho.sun [Wed, 20 Apr 2016 01:32:00 +0000 (18:32 -0700)]
Merge "add perf-scroll sample" into devel/master
Kimmo Hoikka [Tue, 19 Apr 2016 16:01:29 +0000 (09:01 -0700)]
Merge "Flexbox Demo to demonstrates a proof of concept for FlexContainer UI control" into devel/master
Xiangyin Ma [Tue, 19 Apr 2016 10:30:04 +0000 (11:30 +0100)]
Fix a typo of EffectsView example
Change-Id: I5639464418baffc593106dbb95a78b39e438aaf4
minho.sun [Wed, 30 Mar 2016 03:53:31 +0000 (12:53 +0900)]
add perf-scroll sample
add perf-scroll sample for measuring performance on tizen target.
you can use two options.
--use-mesh : use "mesh" to make images.( use imageView by default )
-t30 : set duration.( In this case, duration will be 30 second )
Change-Id: Ib2caca45bed12a62e3e9d6b57fb240aa21579e0c
Richard Huang [Wed, 23 Mar 2016 15:33:32 +0000 (15:33 +0000)]
Flexbox Demo to demonstrates a proof of concept for FlexContainer UI control
Change-Id: I20f7a13ebc19b54ab91194b9c6b87d787f23501d
minho.sun [Thu, 21 Jan 2016 04:49:48 +0000 (13:49 +0900)]
Improve application launching speed
To improve app launching speed on Tizen (using launchpad), Use -fPIE option instead -fPIC and attach DALI_EXPORT_API in front of each example's main function.
This is the compare result between before and after patch.
(On hawkP 2.4 / using hello-dalidemo that has one pushbutton on stage)
| before Patch | After Patch |
---------------------------------------------
| hello-dalidemo | hello-dalidemo |
---------------------------------------------
| AVG MIN MAX | AVG MIN MAX |
| 1134 1060 1188 | 291 250 337 |
After patch, launching speed drops to 30% of before.
Change-Id:I51a4f673d016f9278f867167dc2ff9f407ea6e7e
Ferran Sole [Wed, 6 Apr 2016 09:42:52 +0000 (10:42 +0100)]
Rendering API clean-up
Change-Id: I66e818b2ef1744c20af0997375065e029399df84
Adam Bialogonski [Thu, 14 Apr 2016 17:26:00 +0000 (18:26 +0100)]
line mesh demo supports LINES, LINE_LOOP and LINE_STRIP modes. added radio button to select. The geometry has been switched to use interleaved format with inclusion color to make line segments more visible.
Change-Id: Ifbf9ab55afa216c388e123a521e7e9a8004b4ede
Adam Bialogonski [Fri, 15 Apr 2016 13:59:44 +0000 (14:59 +0100)]
DALi Version 1.1.30
Change-Id: I4267d398db533e98296a87ba2d68dddfca5c118f
Xiangyin Ma [Thu, 4 Feb 2016 17:30:10 +0000 (17:30 +0000)]
Added NativeImageSource example
Change-Id: Ia827bef2339bac2c9c6390d98ae27f3aeff62bc7
Xiangyin Ma [Thu, 17 Dec 2015 17:12:05 +0000 (17:12 +0000)]
Added EffectsView Demo
Change-Id: I604b3ae944c17d33a5ecaa5296966865e2eecd69
Adeel Kazmi [Tue, 12 Apr 2016 15:13:41 +0000 (08:13 -0700)]
Merge "Update PageTurnView Demo" into devel/master
Kimmo Hoikka [Mon, 11 Apr 2016 17:11:29 +0000 (10:11 -0700)]
Merge "Added SVG image to background JSON" into devel/master
Paul Wisbey [Mon, 11 Apr 2016 12:49:15 +0000 (13:49 +0100)]
Removed some dead code from line-mesh-example
Change-Id: I1858ec61c3b6f662320f74289305cea08d831c98
Adeel Kazmi [Mon, 11 Apr 2016 09:12:48 +0000 (10:12 +0100)]
Added SVG image to background JSON
Change-Id: I1fe304f892aa92108cbb07a46368eb267b97f9e0