From: sparky4 <sparky4@cock.li>
Date: Mon, 13 Feb 2017 19:53:46 +0000 (-0600)
Subject: wwww reverted back to before breaking
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=ea8488ca4e63f5789c8e06d87b38404446640887;p=16.git

wwww reverted back to before breaking
---

ea8488ca4e63f5789c8e06d87b38404446640887
diff --cc src/lib/16_tdef.h
index 50bc2261,abd71bdf..c1fe7c29
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@@ -67,7 -67,7 +67,11 @@@ typedef struct 
  //TODO: 16_mm and 16_ca must handle this
  typedef struct {
  	bitmap_t far *data;		//old
++<<<<<<< HEAD
 +	//planar_buf_t far *data;	//old
++=======
+ 	//planar_buf_t far *pbdata;	//old
++>>>>>>> ee3674e42a19f516ea9a48df2c9f3593409141c6
  	word tileHeight, tileWidth;
  	unsigned int rows, cols;
  // 	#ifdef __DEBUG__