Merge remote-tracking branch 'origin/tizen' into devel/new_mesh 65/39565/1
authorFrancisco Santos <f1.santos@samsung.com>
Mon, 18 May 2015 16:45:52 +0000 (17:45 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Mon, 18 May 2015 16:45:52 +0000 (17:45 +0100)
commit9becd3b0cad8489e490fa4694c7c677772397ecf
tree3ad8e024f0db5161abd9807a4c261f661e0e072d
parent5c0a37bfda9d6655dd4f17442dedcbb022b500fd
parent1b44e30f6c6910ba2b30ab7204d7d6f16f4a8100
Merge remote-tracking branch 'origin/tizen' into devel/new_mesh

Conflicts:
adaptors/common/indicator-impl.h

Change-Id: Iaff09e5fd5ad5634b722a4dc4ecd96c0fce5f958
build/tizen/adaptor/Makefile.am