Merge remote-tracking branch 'origin/tizen' into new_text 33/37533/1
authorPaul Wisbey <p.wisbey@samsung.com>
Mon, 30 Mar 2015 14:50:22 +0000 (15:50 +0100)
committerPaul Wisbey <p.wisbey@samsung.com>
Mon, 30 Mar 2015 14:50:54 +0000 (15:50 +0100)
commit66ba4fe9f36786424d655aca1ce3f523b960e5b4
tree9cb23094b156433441ba5c100c0670de40d6830c
parent93ed5b7ab6ba4e3835c6865597b27b6363570ff5
parentc380151ec7ea59444f649e8054c400e259efd79c
Merge remote-tracking branch 'origin/tizen' into new_text

Change-Id: I6fab774d982acc9cc82144c82134379e573658a5
adaptors/common/adaptor-impl.cpp
adaptors/common/adaptor-impl.h
packaging/dali-adaptor-mobile.spec
packaging/dali-adaptor-tv.spec
packaging/dali-adaptor-wearable.spec
packaging/dali-adaptor.spec