widelands-dev team mailing list archive

[Klaus Halfmann <klaus.halfmann@xxxxxxxx>]

Klaus Halfmann has proposed merging lp:~widelands-dev/widelands/silkweaver_song into lp:widelands.

Requested reviews:
  GunChleoc (gunchleoc)

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

Adde the Silweaver Song as ingame music.
-- 
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/silkweaver_song.

=== added file 'data/music/ingame_23.ogg'
Binary files data/music/ingame_23.ogg	1970-01-01 00:00:00 +0000 and data/music/ingame_23.ogg	2017-03-05 10:44:15 +0000 differ
=== modified file 'data/txts/developers.json'
--- data/txts/developers.json	2016-12-03 16:37:13 +0000
+++ data/txts/developers.json	2017-03-05 10:44:15 +0000
@@ -107,7 +107,7 @@
 						"Paul Mehrer (meitis)",
 						"Miroslav Remák (MiroslavR)",
 						"Janosch Peters",
-						"Hasi50 (Klaus Halfmann)",
+						"Klaus Halfmann (Hasi50)",
 						"Philipp Klaus Krause (PkK)",
 						"Notabilis"
 					]
@@ -162,7 +162,8 @@
 						"Barry van Oudtshoorn (barryvan)",
 						"Jan Bruns (Solatis)",
 						"Nikola Whallon (Saturn)",
-						"Joshua O'Leary (Joshun)"
+						"Joshua O'Leary (Joshun)",
+						"Klaus Halfmann (Hasi50)"
 					]
 				}
 			]