Merge remote-tracking branch 'origin/tizen' into devel/new_mesh 21/38421/1
authorFrancisco Santos <f1.santos@samsung.com>
Mon, 20 Apr 2015 13:56:51 +0000 (14:56 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Mon, 20 Apr 2015 13:56:51 +0000 (14:56 +0100)
commit81d8438aa10c6e112273bc7aef848b38a6bda1af
treeef0eb4ea7a3b075e67b175ebb79008f08b4dfe8b
parente54d4d1af5dfd8eeaa591f177367cff25cfeb8b2
parent62ece622c91ac8ff88bff28334df443828498df3
Merge remote-tracking branch 'origin/tizen' into devel/new_mesh

Conflicts:
adaptors/common/indicator-impl.cpp
adaptors/common/object-profiler.cpp

Change-Id: Ib0c42466cd39aa1f40c64f57b90565de40c77d95
adaptors/common/indicator-impl.cpp
adaptors/common/indicator-impl.h
adaptors/common/object-profiler.cpp
build/tizen/adaptor/Makefile.am
build/tizen/configure.ac