53 Commits

Author	SHA1	Message	Date
Jeffrey Pfau	d620a8c38c	DS: Merge GBA and DS timers	2017-01-02 19:31:38 -08:00
Jeffrey Pfau	87caf0a6ac	Merge branch 'master' into medusa	2017-01-02 18:17:50 -08:00
Jeffrey Pfau	fa884d071e	All: Migrate includes to separate directory	2016-12-30 21:25:07 -08:00