Peter M. Groen / dali-demo

Conflicts:
	demo/dali-demo.cpp
	demo/dali-table-view.cpp
	examples/builder/examples.cpp
	examples/buttons/buttons-example.cpp
	examples/item-view/item-view-example.cpp
	examples/path-animation/path-animation.cpp
	examples/text-view/text-view-example.cpp
	shared/view.h

Change-Id: I152b06854b349f0430172227f1d79ee16855fbc0

Change-Id: I05a17ea530a14e94040f24db332178335ce3ce52

Change-Id: I2c5814f4c364e7fe1baf8da352c100529fc074ab

Change-Id: Ie9718a263a8ab3b12209e1409754834ed986460f

Change-Id: Ia5d8582b8eec61517443f24e191e01662ba4a26d

Change-Id: Id953da32620c4a3c57519cf9f5ecd74eb765a430

Change-Id: Ifa5f15cfd57ee71294bc52af0d7b394ff6a5d64a

Conflicts:
	build/tizen/examples/CMakeLists.txt
	demo/dali-demo.cpp
	examples/buttons/buttons-example.cpp
	examples/item-view/item-view-example.cpp
	examples/text-view/text-view-example.cpp

Change-Id: I8816d065edca8e2a3fd37cdcedda4b02735f5007

Change-Id: I779d17d2e54b520d3a53a3913606e569d74cc01e

Change-Id: I820263d4ae6973dd0a28bffb278de3b422c804ce

Change-Id: I1722f103987dfb592a39378e4cb5eefab4ebf5e8

Conflicts:
	build/tizen/CMakeLists.txt
	build/tizen/demo/CMakeLists.txt
	build/tizen/examples/CMakeLists.txt
	demo/dali-table-view.cpp
	examples/buttons/buttons-example.cpp
	examples/shader-effect/dissolve-effect-example.cpp
	examples/shadows/shadow-bone-lighting-example.cpp
	packaging/com.samsung.dali-demo.spec

Change-Id: I57a2de5bfa6d0f05c02b8aba06dec9130f14a906

Change-Id: Ida8d261ecce2ee31fff4d2e1019d6a5537cc1239

The dali-demo launcher will show different languages (more localiation needed).

Example usage for Korean:
  LANGUAGE=ko dali-demo

Change-Id: I03807ac6d90393564afbc81134de4c05b1bc8364

Change-Id: Icc2f491187f7832425d18200fad4e4ea041dfd57

Change-Id: I2a2d265e2d03eff6d36d9108006cbb8a97c70ba7

Change-Id: Id2be0f7ec384525321569ade664337f4cd17201a

Change-Id: I38b89cf180cd9023e6deedbcec24f5308acd7254

Change-Id: If45dc9cc2a8a68fd0f3fcc8d355677684569104c

  - enable_dali_smack_rules addition for handling rule file

Change-Id: I8f438334f94f3ff427cf63656fb589c0df57bf2a

Change-Id: I28c9559d774218cfd33688cf7c32b689189e961c

Change-Id: If36351cb6beb0e333b7d8be562aef44934db6fef

  - 'sec_build_binary_debug_enable and -DTIZEN_DEBUG_ENABLE' are not used.

Change-Id: Ic944dbf08ecd42ed1a7fe5cb5e0143a219a51f0c

Change-Id: Ibef6c918be6f39120451296e5c2220b4a6b4b07e

Change-Id: If834803fe364c9304b79637478434bf83d99c496

Change-Id: Ie854244c03f79ba7ab3df162dc9cdef601fdbd3e

Change-Id: I5048cf348ddfb6c8ec0373eb4e0df19644686355

Change-Id: I374f5c1c386ba620014655518b3981ef50ebcdaa

Change-Id: I9b04b564ea5415942e5594a7f085adb6b4e9583b

Change-Id: I632c0db173fcf1ffa5d4d94816436a5624a24577

Change-Id: Ib9db9b03577556fc5e426f194b8ff3d8e063005e

Change-Id: I7fbb7d0b4d31556e8d1e704f7feb6dda801dd035

Change-Id: Ib7ab32783c9d4f87a861635dd33d418b530310d4

Change-Id: I260e72cb4c324d3a253cdb69380ecbe48cf4d4b3

Change-Id: Ibbb2eb1560febfdc1792ef32962baf112e38da94

Change-Id: I60abdae972631f848513afd7f32deed6898b43b2

Change-Id: I3cd2e1ae336bc9d2fcc9eceba11af1ab355a8fed

Change-Id: I5139c5dd33563894953e2d5d63a25bd9f0307833

Signed-off-by: Lee Morgan <Lee.morgan@partner.samsung.com>
Change-Id: I54de3f9575981c8261d226e988c4a37efc884937
Signed-off-by: Lee Morgan <Lee.morgan@partner.samsung.com>

Change-Id: I4bd9fcb69d7fe62f239504bc2bcbe32c1864acd2