Merge branch 'devel/master' into devel/new_mesh 14/42314/1
authorFrancisco Santos <f1.santos@samsung.com>
Thu, 25 Jun 2015 13:52:15 +0000 (14:52 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Thu, 25 Jun 2015 13:52:15 +0000 (14:52 +0100)
commit8662d9566c568ebb35281da5cc4b49e836c90755
tree20e7d4373863ad061664fc94edf363b2899fc940
parente787f7151479c5699746429a49ef6e735a9395f5
parentec787a0b475257b67a1dc18b9f19a97fb911709f
Merge branch 'devel/master' into devel/new_mesh

Conflicts:
build/tizen/configure.ac

Change-Id: If7a3942fd3f79cfa01b808345875bf121bdb9898
adaptors/common/object-profiler.cpp
build/tizen/adaptor/Makefile.am
build/tizen/configure.ac