Merge branch 'devel/master' into devel/vulkan
authorFrancisco Santos <f1.santos@samsung.com>
Mon, 5 Jun 2017 15:56:35 +0000 (16:56 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Mon, 5 Jun 2017 15:56:35 +0000 (16:56 +0100)
1  2 
build/tizen/configure.ac
dali/internal/update/manager/update-manager.cpp

Simple merge