smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-06 05:35:47 +01:00
Code Issues Projects Releases Wiki Activity

missed merge conflict resolution, now fixed

Browse source
This commit is contained in:
Paul Davis 2014-09-05 07:49:53 -04:00
parent 65dd500200
commit 8f213aefb0
1 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libs/backends/wavesaudio/portmidi/src/porttime/ptwinmm.c
View file

@ -2,15 +2,10 @@
#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;