widelands

Merge lp:~widelands-dev/widelands/music_by_user_NonServiam into lp:widelands

  1. music_by_user_NonServiam
  2. Merge into trunk
Proposed by GunChleoc
Status: Merged
Merged at revision: 8328
Proposed branch: lp:~widelands-dev/widelands/music_by_user_NonServiam
Merge into: lp:widelands
Diff against target: 26 lines (+6/-1)
2 files modified
data/music/LICENSE.txt (+4/-0)
data/txts/developers.json (+2/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/music_by_user_NonServiam
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+321287@code.launchpad.net

Commit message

2 new music tracks "Hypathia's Theme" and "We Work in the Vineyards" by Stuart Marshall.

Description of the change

New music.

To post a comment you must log in.
Revision history for this message
GunChleoc (gunchleoc) wrote :

@bunnybot merge

review: Approve
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 2065. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/216331070.
Appveyor build 1900. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_music_by_user_NonServiam-1900.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'data/music/LICENSE.txt'
2--- data/music/LICENSE.txt 1970-01-01 00:00:00 +0000
3+++ data/music/LICENSE.txt 2017-03-29 12:28:23 +0000
4@@ -0,0 +1,4 @@
5+Unless otherwise stated in this file or in the meta tags, all music is licensed under the GPL v2 or later.
6+
7+ingame_24.ogg (Hypathia's Theme) (c) Stuart Marshall, license CC-BY-SA v3.00
8+ingame_25.ogg (We Work in the Vineyards) (c) Stuart Marshall, license CC-BY-SA v3.00
9
10=== added file 'data/music/ingame_24.ogg'
11Binary files data/music/ingame_24.ogg 1970-01-01 00:00:00 +0000 and data/music/ingame_24.ogg 2017-03-29 12:28:23 +0000 differ
12=== added file 'data/music/ingame_25.ogg'
13Binary files data/music/ingame_25.ogg 1970-01-01 00:00:00 +0000 and data/music/ingame_25.ogg 2017-03-29 12:28:23 +0000 differ
14=== modified file 'data/txts/developers.json'
15--- data/txts/developers.json 2017-03-05 10:36:04 +0000
16+++ data/txts/developers.json 2017-03-29 12:28:23 +0000
17@@ -163,7 +163,8 @@
18 "Jan Bruns (Solatis)",
19 "Nikola Whallon (Saturn)",
20 "Joshua O'Leary (Joshun)",
21- "Klaus Halfmann (Hasi50)"
22+ "Klaus Halfmann (Hasi50)",
23+ "Stuart Marshall"
24 ]
25 }
26 ]

Subscribers

People subscribed via source and target branches

to status/vote changes: