From fbc9d19cb287e3d53ae31310f2f231a88386d56e Mon Sep 17 00:00:00 2001
From: John Emmas <johne53@tiscali.co.uk>
Date: Tue, 6 May 2014 09:25:27 +0100
Subject: [PATCH] Add the 'porttime' source file for Windows

Conflicts:
	libs/backends/wavesaudio/portmidi/src/porttime/ptwinmm.c
---
 libs/backends/wavesaudio/portmidi/src/porttime/ptwinmm.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libs/backends/wavesaudio/portmidi/src/porttime/ptwinmm.c b/libs/backends/wavesaudio/portmidi/src/porttime/ptwinmm.c
index 17675bd6c6..2021a13eee 100644
--- a/libs/backends/wavesaudio/portmidi/src/porttime/ptwinmm.c
+++ b/libs/backends/wavesaudio/portmidi/src/porttime/ptwinmm.c
@@ -2,8 +2,14 @@
 
 
 #include "porttime.h"
+<<<<<<< HEAD
 #include "windows.h"
 #include "time.h"
+=======
+#include <windows.h>
+#include <mmsystem.h>
+#include <time.h>
+>>>>>>> 41fe637... Add the 'porttime' source file for Windows
 
 
 TIMECAPS caps;