Reverted incorrect merge (missing files)
svn up -r 21247 svn merge -r 21247:21246 . (<= revert incorrect: merge -r 21041:21243) svn up
This commit is contained in:
@@ -46,8 +46,9 @@
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
SCA_ExpressionController::SCA_ExpressionController(SCA_IObject* gameobj,
|
||||
const STR_String& exprtext)
|
||||
:SCA_IController(gameobj),
|
||||
const STR_String& exprtext,
|
||||
PyTypeObject* T)
|
||||
:SCA_IController(gameobj,T),
|
||||
m_exprText(exprtext),
|
||||
m_exprCache(NULL)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user