Merge remote-tracking branch 'origin/tizen' into new_text 40/35140/1
authorPaul Wisbey <p.wisbey@samsung.com>
Mon, 9 Feb 2015 15:42:53 +0000 (15:42 +0000)
committerPaul Wisbey <p.wisbey@samsung.com>
Mon, 9 Feb 2015 15:42:53 +0000 (15:42 +0000)
commit220687d7338619331c45e672d1f22111f38aa65d
treeeeba4d61582c1a73b97e8176a78b5675d70638db
parent71c26e615b4f468176b9369cd7ff07d6ca697a1c
parentb7c6477d890a81750318e222c8d206531109634a
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
packaging/dali-adaptor-mobile.spec
packaging/dali-adaptor.spec

Change-Id: I113860d774b819e67cae356d420faed00f5412fa
adaptors/common/style-monitor-impl.cpp
build/tizen/adaptor/Makefile.am
build/tizen/configure.ac
packaging/dali-adaptor-mobile.spec
packaging/dali-adaptor-tv.spec
packaging/dali-adaptor-wearable.spec
packaging/dali-adaptor.spec