Merge remote-tracking branch 'gerrithub/devel/master' into devel/vulkan
authorFrancisco Santos <f1.santos@samsung.com>
Tue, 6 Jun 2017 12:12:14 +0000 (13:12 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Tue, 6 Jun 2017 12:12:14 +0000 (13:12 +0100)
1  2 
build/tizen/configure.ac
dali/internal/update/manager/update-manager.cpp

Simple merge