elementaryart team mailing list archive

[Cody Garver <codygarver@xxxxxxxxx>]

Cody Garver has proposed merging lp:~codygarver/marlin/small-license-tweak into lp:marlin.

Requested reviews:
  The elementary Project (elementaryproject)

For more details, see:
https://code.launchpad.net/~codygarver/marlin/small-license-tweak/+merge/75290
-- 
https://code.launchpad.net/~codygarver/marlin/small-license-tweak/+merge/75290
Your team The elementary Project is requested to review the proposed merge of lp:~codygarver/marlin/small-license-tweak into lp:marlin.

=== modified file 'src/View/Resources.vala'
--- src/View/Resources.vala	2011-08-12 06:06:39 +0000
+++ src/View/Resources.vala	2011-09-14 02:15:28 +0000
@@ -1,6 +1,6 @@
 namespace Marlin {
     public const string APP_TITLE = "Marlin";
-    public const string COPYRIGHT = "Copyright 2010-2011 Elementary Developers";
+    public const string COPYRIGHT = "Copyright © 2010-2011 Elementary Developers";
     public const string ELEMENTARY_URL = "http://elementaryos.org";;
     public const string HELP_URL = "http://elementaryos.org/support";;
     public const string BUG_URL = "https://bugs.launchpad.net/marlin/+filebug";;
@@ -26,18 +26,18 @@
     public const string ICON_ABOUT_LOGO = "system-file-manager";
 
     public const string LICENSE = """
-Marlin is free software; you can redistribute it and/or modify it under the 
-terms of the GNU Lesser General Public License as published by the Free 
-Software Foundation; either version 2 of the License, or (at your option) 
-any later version.
-
-Marlin 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 Lesser General Public License for 
-more details.
-
-You should have received a copy of the GNU Lesser General Public License 
-along with Marlin; if not, write to the Free Software Foundation, Inc., 
+Marlin 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.
+
+Marlin 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.
+
+You should have received a copy of the GNU General Public License
+along with Marlin; if not, write to the Free Software Foundation, Inc.,
 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 """;