More fWiine merging

Conflicts: src/events.c src/motion_plus.c src/wiiuse.h
2011-09-14 08:59:48 -05:00
parent 541cbb5156
commit 9b5ef23276
6 changed files with 41 additions and 24 deletions
--- a/src/events.c
+++ b/src/events.c
@@ -44,6 +44,7 @@
 #include "nunchuk.h"                    /* for nunchuk_disconnected, etc */
 #include "wiiboard.h"                   /* for wii_board_disconnected, etc */
 #include "io.h"                         /* for wiiuse_io_read on Windows, etc */
+#include "motion_plus.h"

 #ifndef WIIUSE_WIN32
 	#include <sys/time.h>                   /* for timeval */