Christian 082ee1a5ea Merge branch 'master' into snapshot15 ... Conflicts: fml-src-1.4.7-4.7.22.539-master.zip fml-src-1.4.7-4.7.35.556-master.zip fml-src-13w02b-4.99.16.541-snapshot15.zip		2013-02-27 23:19:11 -05:00
..
ibxm	Moved paulscode to new client folder	2012-08-04 22:53:48 -07:00
net/minecraftforge/client	Merge branch 'master' into snapshot15	2013-02-27 23:19:11 -05:00
paulscode/sound/codecs	Missed a file	2012-08-05 03:23:38 -07:00
forge_logo.png	Moved logo to new client folder	2012-08-04 22:45:31 -07:00