Merge lp:~codygarver/pantheon-photos/remove-license-space into lp:~pantheon-photos/pantheon-photos/trunk

Proposed by Cody Garver
Status: Merged
Approved by: meese
Approved revision: 2612
Merged at revision: 2612
Proposed branch: lp:~codygarver/pantheon-photos/remove-license-space
Merge into: lp:~pantheon-photos/pantheon-photos/trunk
Diff against target: 45 lines (+14/-16)
1 file modified
src/Resources.vala (+14/-16)
To merge this branch: bzr merge lp:~codygarver/pantheon-photos/remove-license-space
Reviewer Review Type Date Requested Status
meese Approve
Review via email: mp+233112@code.launchpad.net

Commit message

fix license spaces

Description of the change

Look in the About dialog, it's all spaced out

To post a comment you must log in.
Revision history for this message
meese (meese) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Resources.vala'
2--- src/Resources.vala 2014-08-27 06:20:32 +0000
3+++ src/Resources.vala 2014-09-02 20:05:56 +0000
4@@ -52,21 +52,19 @@
5 null
6 };
7
8-public const string LICENSE = """
9- Shotwell is free software; you can redistribute it and/or modify it under the
10- terms of the GNU Lesser General Public License as published by the Free
11- Software Foundation; either version 2.1 of the License, or (at your option)
12- any later version.
13-
14- Shotwell is distributed in the hope that it will be useful, but WITHOUT
15- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
16- FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
17- more details.
18-
19- You should have received a copy of the GNU Lesser General Public License
20- along with Shotwell; if not, write to the Free Software Foundation, Inc.,
21- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
22- """;
23+public const string LICENSE = """Shotwell is free software; you can redistribute it and/or modify it under the
24+terms of the GNU Lesser General Public License as published by the Free
25+Software Foundation; either version 2.1 of the License, or (at your option)
26+any later version.
27+
28+Shotwell is distributed in the hope that it will be useful, but WITHOUT
29+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
30+FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
31+more details.
32+
33+You should have received a copy of the GNU Lesser General Public License
34+along with Shotwell; if not, write to the Free Software Foundation, Inc.,
35+51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA""";
36
37 public const string CLOCKWISE = "object-rotate-right";
38 public const string COUNTERCLOCKWISE = "object-rotate-left";
39@@ -1206,4 +1204,4 @@
40
41 public const string ONIMAGE_FONT_COLOR = "#000000";
42 public const string ONIMAGE_FONT_BACKGROUND = "rgba(255,255,255,0.5)";
43-}
44\ No newline at end of file
45+}

Subscribers

People subscribed via source and target branches

to all changes: