Merge 1.4.1 into trunk

This commit is contained in:
Nick Bolton 2010-06-12 17:20:54 +00:00
parent 1698161945
commit a8eb2a3bfd
27 changed files with 841 additions and 351 deletions

View file

@ -666,9 +666,9 @@ CArch::app() const
}
int
CArch::run(int argc, char** argv, CreateTaskBarReceiverFunc createTaskBarReceiver)
CArch::run(int argc, char** argv)
{
return m_appUtil->run(argc, argv, createTaskBarReceiver);
return m_appUtil->run(argc, argv);
}
void