Author: shadowmaster
Date: Sun Mar 25 10:47:15 2012
New Revision: 53651
URL: http://svn.gna.org/viewcvs/wesnoth?rev=53651&view=rev
Log:
editor: Fix various copyright notice inconsistencies and missing Id lines
Modified:
trunk/src/editor/action/action_unit.cpp
trunk/src/editor/action/action_unit.hpp
trunk/src/editor/map/context_manager.cpp
trunk/src/editor/map/context_manager.hpp
trunk/src/editor/palette/palette_manager.cpp
trunk/src/editor/palette/palette_manager.hpp
trunk/src/editor/palette/terrain_palettes.cpp
trunk/src/editor/toolkit/brush_bar.cpp
trunk/src/editor/toolkit/brush_bar.hpp
trunk/src/editor/toolkit/editor_toolkit.cpp
trunk/src/editor/toolkit/editor_toolkit.hpp
Modified: trunk/src/editor/action/action_unit.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/editor/action/action_unit.cpp?rev=53651&r1=53650&r2=53651&view=diff
==============================================================================
--- trunk/src/editor/action/action_unit.cpp (original)
+++ trunk/src/editor/action/action_unit.cpp Sun Mar 25 10:47:15 2012
@@ -1,6 +1,6 @@
/* $Id$ */
/*
- Copyright (C) 2008 - 2011 by Fabian Mueller <[email protected]>
+ Copyright (C) 2008 - 2012 by Fabian Mueller <[email protected]>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Modified: trunk/src/editor/action/action_unit.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/editor/action/action_unit.hpp?rev=53651&r1=53650&r2=53651&view=diff
==============================================================================
--- trunk/src/editor/action/action_unit.hpp (original)
+++ trunk/src/editor/action/action_unit.hpp Sun Mar 25 10:47:15 2012
@@ -1,6 +1,6 @@
/* $Id$ */
/*
- Copyright (C) 2008 - 2011 by Fabian Mueller <[email protected]>
+ Copyright (C) 2008 - 2012 by Fabian Mueller <[email protected]>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
Modified: trunk/src/editor/map/context_manager.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/editor/map/context_manager.cpp?rev=53651&r1=53650&r2=53651&view=diff
==============================================================================
--- trunk/src/editor/map/context_manager.cpp (original)
+++ trunk/src/editor/map/context_manager.cpp Sun Mar 25 10:47:15 2012
@@ -1,4 +1,4 @@
-
+/* $Id$ */
/*
Copyright (C) 2003 - 2012 by David White <[email protected]>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
Modified: trunk/src/editor/map/context_manager.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/editor/map/context_manager.hpp?rev=53651&r1=53650&r2=53651&view=diff
==============================================================================
--- trunk/src/editor/map/context_manager.hpp (original)
+++ trunk/src/editor/map/context_manager.hpp Sun Mar 25 10:47:15 2012
@@ -1,3 +1,18 @@
+/* $Id$ */
+/*
+ Copyright (C) 2003 - 2012 by David White <[email protected]>
+ Part of the Battle for Wesnoth Project http://www.wesnoth.org/
+
+ 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
+ (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
#ifndef CONTEXT_MANAGER_HPP_INCLUDED
#define CONTEXT_MANAGER_HPP_INCLUDED
Modified: trunk/src/editor/palette/palette_manager.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/editor/palette/palette_manager.cpp?rev=53651&r1=53650&r2=53651&view=diff
==============================================================================
--- trunk/src/editor/palette/palette_manager.cpp (original)
+++ trunk/src/editor/palette/palette_manager.cpp Sun Mar 25 10:47:15 2012
@@ -1,16 +1,16 @@
/* $Id: editor_palettes.cpp 53522 2012-03-13 18:19:16Z fendrin $ */
/*
- Copyright (C) 2003 - 2012 by David White <[email protected]>
- Part of the Battle for Wesnoth Project http://www.wesnoth.org/
-
- 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
+ Copyright (C) 2003 - 2012 by David White <[email protected]>
+ Part of the Battle for Wesnoth Project http://www.wesnoth.org/
+
+ 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
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
-
- See the COPYING file for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
*/
#define GETTEXT_DOMAIN "wesnoth-editor"
Modified: trunk/src/editor/palette/palette_manager.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/editor/palette/palette_manager.hpp?rev=53651&r1=53650&r2=53651&view=diff
==============================================================================
--- trunk/src/editor/palette/palette_manager.hpp (original)
+++ trunk/src/editor/palette/palette_manager.hpp Sun Mar 25 10:47:15 2012
@@ -1,15 +1,16 @@
+/* $Id$ */
/*
- Copyright (C) 2012 - 2012 by Fabian Mueller <[email protected]>
- Part of the Battle for Wesnoth Project http://www.wesnoth.org/
+ Copyright (C) 2012 by Fabian Mueller <[email protected]>
+ Part of the Battle for Wesnoth Project http://www.wesnoth.org/
- 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
+ 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
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
- See the COPYING file for more details.
+ See the COPYING file for more details.
*/
/**
Modified: trunk/src/editor/palette/terrain_palettes.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/editor/palette/terrain_palettes.cpp?rev=53651&r1=53650&r2=53651&view=diff
==============================================================================
--- trunk/src/editor/palette/terrain_palettes.cpp (original)
+++ trunk/src/editor/palette/terrain_palettes.cpp Sun Mar 25 10:47:15 2012
@@ -3,17 +3,10 @@
Copyright (C) 2003 - 2012 by David White <[email protected]>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
-<<<<<<< .mine
- 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 (at your option) any later version.
-=======
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
(at your option) any later version.
->>>>>>> .r53570
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY.
Modified: trunk/src/editor/toolkit/brush_bar.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/editor/toolkit/brush_bar.cpp?rev=53651&r1=53650&r2=53651&view=diff
==============================================================================
--- trunk/src/editor/toolkit/brush_bar.cpp (original)
+++ trunk/src/editor/toolkit/brush_bar.cpp Sun Mar 25 10:47:15 2012
@@ -1,16 +1,16 @@
+/* $Id$ */
+/*
+ Copyright (C) 2003 - 2012 by David White <[email protected]>
+ Part of the Battle for Wesnoth Project http://www.wesnoth.org/
-/*
- Copyright (C) 2003 - 2012 by David White <[email protected]>
- Part of the Battle for Wesnoth Project http://www.wesnoth.org/
+ 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
+ (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
- 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
- (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
-
- See the COPYING file for more details.
+ See the COPYING file for more details.
*/
/**
Modified: trunk/src/editor/toolkit/brush_bar.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/editor/toolkit/brush_bar.hpp?rev=53651&r1=53650&r2=53651&view=diff
==============================================================================
--- trunk/src/editor/toolkit/brush_bar.hpp (original)
+++ trunk/src/editor/toolkit/brush_bar.hpp Sun Mar 25 10:47:15 2012
@@ -1,16 +1,16 @@
+/* $Id$ */
+/*
+ Copyright (C) 2003 - 2012 by David White <[email protected]>
+ Part of the Battle for Wesnoth Project http://www.wesnoth.org/
-/*
- Copyright (C) 2003 - 2012 by David White <[email protected]>
- Part of the Battle for Wesnoth Project http://www.wesnoth.org/
+ 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
+ (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
- 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
- (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
-
- See the COPYING file for more details.
+ See the COPYING file for more details.
*/
/**
Modified: trunk/src/editor/toolkit/editor_toolkit.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/editor/toolkit/editor_toolkit.cpp?rev=53651&r1=53650&r2=53651&view=diff
==============================================================================
--- trunk/src/editor/toolkit/editor_toolkit.cpp (original)
+++ trunk/src/editor/toolkit/editor_toolkit.cpp Sun Mar 25 10:47:15 2012
@@ -1,3 +1,17 @@
+/* $Id$ */
+/*
+ Copyright (C) 2012 by Fabian Mueller <[email protected]>
+ Part of the Battle for Wesnoth Project http://www.wesnoth.org/
+
+ 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
+ (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
#include "editor_toolkit.hpp"
#include "foreach.hpp"
Modified: trunk/src/editor/toolkit/editor_toolkit.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/editor/toolkit/editor_toolkit.hpp?rev=53651&r1=53650&r2=53651&view=diff
==============================================================================
--- trunk/src/editor/toolkit/editor_toolkit.hpp (original)
+++ trunk/src/editor/toolkit/editor_toolkit.hpp Sun Mar 25 10:47:15 2012
@@ -1,16 +1,16 @@
+/* $Id$ */
+/*
+ Copyright (C) 2012 by Fabian Mueller <[email protected]>
+ Part of the Battle for Wesnoth Project http://www.wesnoth.org/
-/*
- Copyright (C) 2003 - 2012 by Fabian Mueller <[email protected]>
- Part of the Battle for Wesnoth Project http://www.wesnoth.org/
+ 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
+ (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
- 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
- (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
-
- See the COPYING file for more details.
+ See the COPYING file for more details.
*/
#ifndef EDITOR_TOOLKIT_H_INCLUDED
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
