moved luajit-2.0 and mupdf to latest version - now really

Conflicts:

	Makefile

Makefile

@@ -147,11 +147,7 @@ kpdfview: kpdfview.o einkfb.o pdf.o blitbuffer.o drawcontext.o koptcontext.o inp
 		$(LDFLAGS) \
 		-Wl,-rpath=$(LIBDIR)/ \
 		-o $@ \
-<<<<<<< HEAD
 		-lm -ldl -lpthread -lk2pdfopt -ldjvulibre -lluajit-5.1 -L$(MUPDFLIBDIR) -L$(LIBDIR)\
-=======
-		-lm -ldl -lpthread -ldjvulibre -ljpeg -lluajit-5.1 -L$(MUPDFLIBDIR) -L$(LIBDIR)\
->>>>>>> 5c10908... disabled patching of libjpeg, restructured everything for mupdf subrepos
 		$(EMU_LDFLAGS) \
 		$(DYNAMICLIBSTDCPP)
 
@@ -210,6 +206,7 @@ fetchthirdparty:
 		patch -N -p0 < ../../../lvrend_node_type_face.patch && \
 		patch -N -p3 < ../../../lvdocview-getCurrentPageLinks.patch || true
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 	# dirty patch in MuPDF's thirdparty liby for CREngine
 	# still needed? excluded for now since they do not apply out of the box
@@ -217,6 +214,8 @@ fetchthirdparty:
 	#	patch -N -p0 < ../../../kpvcrlib/jpeg_compress_struct_size.patch &&\
 	#	patch -N -p0 < ../../../kpvcrlib/jpeg_decompress_struct_size.patch
 >>>>>>> 5c10908... disabled patching of libjpeg, restructured everything for mupdf subrepos
+=======
+>>>>>>> a048235... moved luajit-2.0 and mupdf to latest version - now really
 	# MuPDF patch: use external fonts
 	cd mupdf && patch -N -p1 < ../mupdf.patch
 	test -f popen-noshell/popen_noshell.c || svn co http://popen-noshell.googlecode.com/svn/trunk/ popen-noshell