projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge "Fixed an error adding duplicate primary position.y" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-video-player.h
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-video-player.h
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-video-player.h
index
f33a68c
..
717a243
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-video-player.h
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-video-player.h
@@
-49,7
+49,7
@@
public:
VideoPlayer();
-
virtual
~VideoPlayer();
+ ~VideoPlayer();
static VideoPlayer New();
@@
-102,4
+102,3
@@
private:
} // namespace Dali;
#endif
-