Merge 1.4.1 r603:604 into trunk

This commit is contained in:
Nick Bolton 2010-06-13 00:06:11 +00:00
parent 351818a4db
commit 8ee25ea2ce
4 changed files with 5 additions and 5 deletions

View file

@ -50,9 +50,9 @@ standardStartupStatic(int argc, char** argv)
}
int
CArchAppUtilUnix::run(int argc, char** argv, CreateTaskBarReceiverFunc createTaskBarReceiver)
CArchAppUtilUnix::run(int argc, char** argv)
{
return app().runInner(argc, argv, NULL, &standardStartupStatic, createTaskBarReceiver);
return app().runInner(argc, argv, NULL, &standardStartupStatic);
}
void