Merge remote-tracking branch 'origin/tizen' into new_text 79/36779/3
authorPaul Wisbey <p.wisbey@samsung.com>
Fri, 13 Mar 2015 10:30:17 +0000 (10:30 +0000)
committerPaul Wisbey <p.wisbey@samsung.com>
Fri, 13 Mar 2015 11:15:51 +0000 (11:15 +0000)
commit9eaa0f472de1629358812f464200203bc2ee5bf8
tree4e7dd2aa6d07217f74745efccccc2465fd0ba9ad
parent7fef226255ef894c698a59e776da682979000aff
parent1b0107632bd508b5d5c3e6c5cdb54c76f456316d
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
adaptors/common/adaptor-impl.cpp
adaptors/common/application-impl.cpp

Change-Id: Ic74c259b7a0dfc5f103c7afd93a8e567aee77be2
adaptors/common/application-impl.cpp
adaptors/common/gl/egl-image-extensions.cpp
adaptors/common/window-impl.h
adaptors/public-api/adaptor-framework/window.h
build/tizen/adaptor/Makefile.am
packaging/dali-adaptor-mobile.spec
packaging/dali-adaptor-tv.spec
packaging/dali-adaptor-wearable.spec
packaging/dali-adaptor.spec