From: Marten Richter <marten.richter@freenet.de>
Date: Wed, 27 Jun 2012 06:15:25 +0000 (+0200)
Subject: Fix compiling again
X-Git-Tag: 0-4-0^2~12^2~104
X-Git-Url: https://git.vomp.tv/gitweb/?a=commitdiff_plain;h=3325a87ab47cc0b595ce640c64f9071fed69f54e;p=vompclient.git

Fix compiling again

Conflicts:
	Makefile.nmake
---

3325a87ab47cc0b595ce640c64f9071fed69f54e
diff --cc Makefile.nmake
index 3f97014,62febcb..8342d96
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@@ -17,7 -17,7 +17,11 @@@ CROSSLIBS 
  !include "objects.mk"
  
  
++<<<<<<< HEAD
 +OBJECTSWIN = winmain.o threadwin.o remotewin.o ledwin.o mtdwin.o videowin.o audiowin.o osdwin.o surfacewin.o dsallocator.o dssourcefilter.o dssourcepin.o wwinvideofilter.o wwinaudiofilter.o wwinmp3audiofilter.o wjpegsimple.o 
++=======
+ OBJECTSWIN = winmain.o threadwin.o remotewin.o ledwin.o mtdwin.o videowin.o audiowin.o osdwin.o surfacewin.o dsallocator.o dssourcefilter.o dssourcepin.o wwinvideofilter.o wwinaudiofilter.o wwinmp3audiofilter.o wjpegsimple.o mediafile.o
++>>>>>>> 4612f8232dc402bada10681545f690c47ef4493a
  
  OBJECTS = $(OBJECTS1) $(OBJECTSWIN)