widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/music_by_user_NonServiam into lp:widelands.

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

Requested reviews:
  GunChleoc (gunchleoc)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/music_by_user_NonServiam/+merge/321287

New music.
-- 
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/music_by_user_NonServiam.

=== added file 'data/music/LICENSE.txt'
--- data/music/LICENSE.txt	1970-01-01 00:00:00 +0000
+++ data/music/LICENSE.txt	2017-03-29 12:28:23 +0000
@@ -0,0 +1,4 @@
+Unless otherwise stated in this file or in the meta tags, all music is licensed under the GPL v2 or later.
+
+ingame_24.ogg (Hypathia's Theme) (c) Stuart Marshall, license CC-BY-SA v3.00
+ingame_25.ogg (We Work in the Vineyards) (c) Stuart Marshall, license CC-BY-SA v3.00

=== added file 'data/music/ingame_24.ogg'
Binary 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
=== added file 'data/music/ingame_25.ogg'
Binary 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
=== modified file 'data/txts/developers.json'
--- data/txts/developers.json	2017-03-05 10:36:04 +0000
+++ data/txts/developers.json	2017-03-29 12:28:23 +0000
@@ -163,7 +163,8 @@
 						"Jan Bruns (Solatis)",
 						"Nikola Whallon (Saturn)",
 						"Joshua O'Leary (Joshun)",
-						"Klaus Halfmann (Hasi50)"
+						"Klaus Halfmann (Hasi50)",
+						"Stuart Marshall"
 					]
 				}
 			]