Merging 1.9.1 source: root changes

This commit is contained in:
Evan Debenham
2015-11-10 04:19:04 -05:00
parent bd4decc6b7
commit bc1e3ee17a
4 changed files with 21 additions and 16 deletions
@@ -28,6 +28,7 @@ public class Assets {
public static final String BANNERS = "banners.png";
public static final String BADGES = "badges.png";
public static final String LOCKED = "locked_badge.png";
public static final String AMULET = "amulet.png";
public static final String CHROME = "chrome.png";