diff default.cfg @ 803:236a184bf6f0

Merge
author Michael Pavone <pavone@retrodev.com>
date Sun, 26 Jul 2015 16:51:03 -0700
parents 0e5f14d9a579
children b6842dfb8edf
line wrap: on
line diff
--- a/default.cfg	Sun Jul 26 16:48:25 2015 -0700
+++ b/default.cfg	Sun Jul 26 16:51:03 2015 -0700
@@ -54,6 +54,13 @@
 	}
 }
 
+io {
+	devices {
+		1 gamepad6.1
+		2 gamepad6.2
+	}
+}
+
 video {
 	width 640
 	vertex_shader default.v.glsl
@@ -66,6 +73,7 @@
 }
 
 clocks {
+	max_cycles 3420
 	speeds {
 		1 150
 		2 200