Merge branch 'master' into tizen
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Tue, 10 Jun 2014 15:34:19 +0000 (16:34 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Tue, 10 Jun 2014 15:34:19 +0000 (16:34 +0100)
commitc07e3ed89c64a853b2c4a6865c757764761413b1
tree29421fe3ebbfaf5fd42b132ce24d167e8d529877
parent4437582a0dbf23e6aad5ea5b2d999dd9818c4f71
parent8b20bcf8dce05ecad2e43b6272087b0b6c24d3b8
Merge branch 'master' into tizen
adaptors/tizen/internal/common/events/event-handler.cpp
adaptors/tizen/internal/common/indicator-impl.cpp
adaptors/tizen/internal/common/indicator-impl.h
adaptors/tizen/internal/common/object-profiler.cpp
adaptors/tizen/internal/common/object-profiler.h
adaptors/tizen/internal/common/window-impl.cpp
adaptors/tizen/internal/common/window-impl.h
adaptors/tizen/public-api/adaptor-framework/common/window.cpp
capi/dali/public-api/adaptor-framework/common/window.h
packaging/dali-adaptor.spec