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

Proposed by GunChleoc on 2019-02-10
Status: Merged
Merged at revision: 8978
Proposed branch: lp:~widelands-dev/widelands/scotty_the_scout
Merge into: lp:widelands
Diff against target: 11 lines (+1/-0)
1 file modified
data/music/LICENSE.txt (+1/-0)
To merge this branch: bzr merge lp:~widelands-dev/widelands/scotty_the_scout
Reviewer Review Type Date Requested Status
Klaus Halfmann listen 2019-02-10 Approve on 2019-02-10
Review via email: mp+362943@code.launchpad.net

Commit message

New music track "Scotty the Scout" by Stuart Marshall

To post a comment you must log in.
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4448. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/491208869.
Appveyor build 4236. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_scotty_the_scout-4236.

GunChleoc (gunchleoc) wrote :

Thanks!

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/music/LICENSE.txt'
2--- data/music/LICENSE.txt 2017-03-29 12:21:41 +0000
3+++ data/music/LICENSE.txt 2019-02-10 10:16:01 +0000
4@@ -2,3 +2,4 @@
5
6 ingame_24.ogg (Hypathia's Theme) (c) Stuart Marshall, license CC-BY-SA v3.00
7 ingame_25.ogg (We Work in the Vineyards) (c) Stuart Marshall, license CC-BY-SA v3.00
8+ingame_27.ogg (Scotty the Scout) (c) Stuart Marshall, license CC-BY-SA v3.00
9
10=== added file 'data/music/ingame_27.ogg'
11Binary files data/music/ingame_27.ogg 1970-01-01 00:00:00 +0000 and data/music/ingame_27.ogg 2019-02-10 10:16:01 +0000 differ