projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel/master (1.2.0)' into tizen
[platform/core/uifw/dali-adaptor.git]
/
adaptors
/
ubuntu
/
framework-ubuntu.cpp
diff --git
a/adaptors/ubuntu/framework-ubuntu.cpp
b/adaptors/ubuntu/framework-ubuntu.cpp
index
cb7252b
..
fe706ea
100644
(file)
--- a/
adaptors/ubuntu/framework-ubuntu.cpp
+++ b/
adaptors/ubuntu/framework-ubuntu.cpp
@@
-124,7
+124,7
@@
struct Framework::Impl
};
-Framework::Framework( Framework::Observer& observer, int *argc, char ***argv )
+Framework::Framework( Framework::Observer& observer, int *argc, char ***argv
, Type type
)
: mObserver(observer),
mInitialised(false),
mRunning(false),