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 "Debug renderer" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
scripting
/
script-impl.h
diff --git
a/dali-toolkit/internal/scripting/script-impl.h
b/dali-toolkit/internal/scripting/script-impl.h
index
bda3721
..
e8677b3
100644
(file)
--- a/
dali-toolkit/internal/scripting/script-impl.h
+++ b/
dali-toolkit/internal/scripting/script-impl.h
@@
-21,8
+21,8
@@
#include <dali/public-api/object/base-object.h>
// INTERNAL INCLUDES
#include <dali/public-api/object/base-object.h>
// INTERNAL INCLUDES
-#include <dali-toolkit/
public
-api/scripting/script.h>
-#include <dali-toolkit/
public
-api/scripting/script-plugin.h>
+#include <dali-toolkit/
devel
-api/scripting/script.h>
+#include <dali-toolkit/
devel
-api/scripting/script-plugin.h>
namespace Dali
namespace Dali
@@
-51,7
+51,7
@@
public:
/**
* @copydoc Toolkit::Script::ExecuteFile
*/
/**
* @copydoc Toolkit::Script::ExecuteFile
*/
-
void
ExecuteFile( const std::string& filename );
+
bool
ExecuteFile( const std::string& filename );
protected:
protected: