Merge branch 'aethyra/master'

Conflicts:
	docs/FAQ.txt
	packaging/windows/make-translations.vbs
	src/Makefile.am
	src/gui/colour.cpp
	src/gui/colour.h
	src/gui/popupmenu.cpp
	src/gui/setup_colours.h
	src/main.cpp
	src/main.h
	src/resources/resourcemanager.cpp
	src/text.cpp
	src/text.h
	src/textmanager.cpp
	src/textmanager.h

1 files changed, 8 insertions, 7 deletions

diff --git a/src/gui/recorder.cpp b/src/gui/recorder.cpp
index 1e7d8e13..153bffae 100644
--- a/src/gui/recorder.cpp
+++ b/src/gui/recorder.cpp
@@ -1,15 +1,15 @@
 /*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  A chat recorder
+ *  Copyright (C) 2008  Lloyd Bryant <lloyd_bryant@netzero.net>
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
@@ -52,6 +52,10 @@ Recorder::Recorder(ChatWindow *chat, const std::string &title,
     loadWindowState();
 }
 
+Recorder::~Recorder()
+{
+}
+
 void Recorder::record(const std::string &msg)
 {
     if (mStream.is_open())
@@ -110,6 +114,3 @@ void Recorder::action(const gcn::ActionEvent &event)
     changeRecordingStatus("");
 }
 
-Recorder::~Recorder()
-{
-}