Anuken 519d2c1714 Merge remote-tracking branch 'origin/master' ... # Conflicts: # core/assets/sprites/icon.icns		2018-05-24 21:14:10 -04:00
..
bundles	Updated polish bundle	2018-05-20 16:05:24 -04:00
cursors
maps
music	iOS plist fixes, re-added music	2018-05-16 11:06:15 -07:00
shaders
sounds	Changed OGGs to MP3s, fixed desktop version being unable to start	2018-04-27 22:44:21 -04:00
sprites	Merge remote-tracking branch 'origin/master'	2018-05-24 21:14:10 -04:00
ui