4 Commits

Author	SHA1	Message	Date
Poojawa	b1b4826c0c	July 5th TG sync (#1883) ... July 5th TG sync	2017-07-05 22:14:19 -05:00
LetterJay	2a5be91970	compile fixes	2017-06-12 16:12:00 -05:00
LetterJay	55d30f865b	upstream-merge-28062	2017-06-12 12:20:07 -05:00
CitadelStationBot	c07034f45a	The kinetic crusher can now gain bonus effects via trophies gained by killing bosses with it	2017-05-27 20:55:08 -05:00