3 Commits

Author	SHA1	Message	Date
Timo Strunk	cb5c951a70	Merge remote-tracking branch 'upstream/master' into zip_ui ... Conflicts: retroarch.c (defer_core was moved and modified by me)	2014-09-21 17:37:23 +02:00
twinaphex	092ba10b1c	Indent/style nits	2014-09-19 07:55:02 +02:00
twinaphex	58cfb27c5a	Split up some of the code in retroarch.c to general.c	2014-09-19 07:34:34 +02:00