Merge branch 'debug' of git@github.com:optixx/snesram into debug

Conflicts: avr/usbload/commandline/snesuploader
2009-06-25 19:20:05 +02:00
parent fc785d3ec8 daae8ef051
commit 50886c58bd
14 changed files with 79 additions and 152 deletions
--- a/avr/usbload/commandline/opendevice.c
+++ b/avr/usbload/commandline/opendevice.c
@@ -11,6 +11,7 @@
 * open a device based on libusb or libusb-win32. 
 */

+
 #include <stdio.h>
 #include "opendevice.h"

--- a/avr/usbload/commandline/snesuploader
+++ b/avr/usbload/commandline/snesuploader