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

@@ -27,6 +27,6 @@
int
main(int argc, char** argv)
{
CClientApp app;
return app.run(argc, argv, createTaskBarReceiver);
CClientApp app(createTaskBarReceiver);
return app.run(argc, argv);
}

View File

@@ -27,6 +27,6 @@
int
main(int argc, char** argv)
{
CServerApp app;
return app.run(argc, argv, createTaskBarReceiver);
CServerApp app(createTaskBarReceiver);
return app.run(argc, argv);
}