Merged a bunch of small changes from trunk to 0.0 and set svn:eol-style

to native for some files that were still missing this property. This is 
a feeble attempt to reduce the amount of conflicts for future merges.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/gui/window.h b/src/gui/window.h
index b83aa78b..583601ab 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -52,11 +52,11 @@ class Window : public gcn::Window
          * Constructor. Initializes the title to the given text and hooks
          * itself into the window container.
          *
-         * @param text   The initial window title, "Window" by default.
-         * @param modal  Block input to other windows.
-         * @param parent The parent window. This is the window standing above
-         *               this one in the window hiearchy. When reordering,
-         *               a window will never go below its parent window.
+         * @param caption The initial window title, "Window" by default.
+         * @param modal   Block input to other windows.
+         * @param parent  The parent window. This is the window standing above
+         *                this one in the window hiearchy. When reordering,
+         *                a window will never go below its parent window.
          */
         Window(const std::string &caption = "Window", bool modal = false,
                 Window *parent = NULL);