diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-22 19:45:03 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-22 19:45:56 +0100 |
| commit | 0c43d04b438d41c277ae80402d4b4888db1a0b64 (patch) | |
| tree | 3aaeb75ecd1bcbe85decedab5f1fa426fe0411e3 /src/gui/window.h | |
| parent | a7f5eaeb7f643658d356533a608f0f18d85b6d32 (diff) | |
| parent | 401802c1d7a1b3d659bdc53a45d9a6292fc1121e (diff) | |
| download | mana-0c43d04b438d41c277ae80402d4b4888db1a0b64.tar.gz mana-0c43d04b438d41c277ae80402d4b4888db1a0b64.tar.bz2 mana-0c43d04b438d41c277ae80402d4b4888db1a0b64.tar.xz mana-0c43d04b438d41c277ae80402d4b4888db1a0b64.zip | |
Merged the tmwserv client with the eAthena client
This merge involved major changes on both sides, and as such took
several weeks. Lots of things are expected to be broken now, however, we
now have a single code base to improve and extend, which can be compiled
to support either eAthena or tmwserv.
In the coming months, the plan is to work towards a client that supports
both eAthena and tmwserv, without needing to be recompiled.
Conflicts:
Everywhere!
Diffstat (limited to 'src/gui/window.h')
| -rw-r--r-- | src/gui/window.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/window.h b/src/gui/window.h index 518de6e9..3806342a 100644 --- a/src/gui/window.h +++ b/src/gui/window.h @@ -263,7 +263,7 @@ class Window : public gcn::Window, gcn::WidgetListener /** * Loads a window skin */ - void loadSkin(const std::string &filename); + void loadSkin(const std::string &fileName); /** * Adds a widget to the window and sets it at given cell. |