yugecin a6540044b6 Merge remote-tracking branch 'remotes/original/master' into upstream ... # Conflicts: # src/itdelatrisu/opsu/Container.java # src/itdelatrisu/opsu/GameData.java # src/itdelatrisu/opsu/Options.java # src/itdelatrisu/opsu/audio/MusicController.java # src/itdelatrisu/opsu/objects/Circle.java # src/itdelatrisu/opsu/objects/Slider.java # src/itdelatrisu/opsu/render/CurveRenderState.java # src/itdelatrisu/opsu/states/Game.java # src/itdelatrisu/opsu/states/MainMenu.java # src/itdelatrisu/opsu/states/SongMenu.java # src/itdelatrisu/opsu/ui/Colors.java # src/itdelatrisu/opsu/ui/MenuButton.java		2016-12-24 14:35:20 +01:00
..
HitSound.java	Added lots of 'final' modifiers to class fields where applicable.	2015-08-20 21:11:55 -05:00
MultiClip.java	making _sure_ that #37 doesn't happen anymroe	2016-10-15 20:16:14 +02:00
MusicController.java	Merge remote-tracking branch 'remotes/original/master' into upstream	2016-12-24 14:35:20 +01:00
SoundController.java	Merge branch 'master' of https://github.com/itdelatrisu/opsu into 'upstream'	2016-12-10 01:19:31 +01:00
SoundEffect.java	Added lots of 'final' modifiers to class fields where applicable.	2015-08-20 21:11:55 -05:00