Merge branch 'cynara' into tizen 38/37338/1
authorLukasz Wojciechowski <l.wojciechow@partner.samsung.com>
Tue, 24 Mar 2015 19:32:02 +0000 (20:32 +0100)
committerLukasz Wojciechowski <l.wojciechow@partner.samsung.com>
Tue, 24 Mar 2015 19:55:06 +0000 (20:55 +0100)
commit89f2ab1b5f41c27e8b08dd27b4343778a991af0a
tree38a7f88b40608dcf5b4fc02010163fa10378a828
parent5f8f8f6eb12ee0dce62fc92c46c704459f8e6329
parent80995bf6ca553e1c13800b7ab4eafbe14d932b29
Merge branch 'cynara' into tizen

Conflicts:
src/framework/include/dpl/test/test_runner.h
src/framework/src/test_runner.cpp

Change-Id: I7186c1d1e8f60e453ea5ffe4f7cfd1e1eca3a3bb
src/framework/include/dpl/test/test_runner.h
src/framework/src/test_runner.cpp
src/framework/src/test_runner_child.cpp