Merge lp:~florian-angermeier/widelands-media/widelands-media into lp:widelands-media

Proposed by Florian Angermeier
Status: Merged
Merged at revision: 228
Proposed branch: lp:~florian-angermeier/widelands-media/widelands-media
Merge into: lp:widelands-media
Diff against target: 32 lines (+18/-0)
2 files modified
graphics/tribes/barbarians/immovables/reedfield/license.txt (+2/-0)
graphics/tribes/barbarians/immovables/reedfield/license_gpl2.txt (+16/-0)
To merge this branch: bzr merge lp:~florian-angermeier/widelands-media/widelands-media
Reviewer Review Type Date Requested Status
Florian Angermeier Approve
Review via email: mp+374544@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Florian Angermeier (florian-angermeier) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'graphics/tribes/barbarians/immovables/reedfield'
2=== added file 'graphics/tribes/barbarians/immovables/reedfield/license.txt'
3--- graphics/tribes/barbarians/immovables/reedfield/license.txt 1970-01-01 00:00:00 +0000
4+++ graphics/tribes/barbarians/immovables/reedfield/license.txt 2019-10-22 17:47:38 +0000
5@@ -0,0 +1,2 @@
6+This work by Florian R. A. Angermeier (fraang) is licensed under the Creative Commons Attribution - ShareAlike 3.0 Unported License.
7+To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/.
8
9=== added file 'graphics/tribes/barbarians/immovables/reedfield/license_gpl2.txt'
10--- graphics/tribes/barbarians/immovables/reedfield/license_gpl2.txt 1970-01-01 00:00:00 +0000
11+++ graphics/tribes/barbarians/immovables/reedfield/license_gpl2.txt 2019-10-22 17:47:38 +0000
12@@ -0,0 +1,16 @@
13+Widelands artwork
14+Copyright (C) 2015 Florian R. A. Angermeier
15+
16+This program is free software; you can redistribute it and/or
17+modify it under the terms of the GNU General Public License
18+as published by the Free Software Foundation; either version 2
19+of the License, or (at your option) any later version.
20+
21+This program is distributed in the hope that it will be useful,
22+but WITHOUT ANY WARRANTY; without even the implied warranty of
23+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24+GNU General Public License for more details.
25+
26+You should have received a copy of the GNU General Public License
27+along with this program; if not, write to the Free Software
28+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
29\ No newline at end of file
30
31=== added file 'graphics/tribes/barbarians/immovables/reedfield/reedfield.blend'
32Binary files graphics/tribes/barbarians/immovables/reedfield/reedfield.blend 1970-01-01 00:00:00 +0000 and graphics/tribes/barbarians/immovables/reedfield/reedfield.blend 2019-10-22 17:47:38 +0000 differ

Subscribers

People subscribed via source and target branches

to status/vote changes: