Projects >> emul >>465c0f5a3af45b9b849b9bbef458aa1c1f7f29a2

Chunk
Conflicting content 
		}
	}
	
<<<<<<< HEAD
    public synchronized void touchAbsoluteVdpMemory(int vdpaddr, boolean isByte) {
    	synchronized (vdpCanvas) {
	    	vdpTouches.set(vdpaddr);
	    	if (!isByte)
	    		vdpTouches.set(vdpaddr + 1);
	    	//long now = System.currentTimeMillis();
	    	//if (now >= nextTouchFlushTime) {
	    	//	flushVdpChanges();
	    	//	nextTouchFlushTime = now + 1000;
	    	//}
    	}
=======
    public void touchAbsoluteVdpMemory(int vdpaddr, boolean isByte) {
    	synchronized (this.vdpCanvas) {
    		synchronized (this) {
		    	vdpTouches.set(vdpaddr);
		    	if (!isByte)
		    		vdpTouches.set(vdpaddr + 1);
    		}
    	}
    	//long now = System.currentTimeMillis();
    	//if (now >= nextTouchFlushTime) {
    	//	flushVdpChanges();
    	//	nextTouchFlushTime = now + 1000;
    	//}
>>>>>>> 6b26c70d7134ae84fda4078559dd60b315eb9381
    }
    
	protected void dirtySprites() {
Solution content 
		}
	}
	
    public synchronized void touchAbsoluteVdpMemory(int vdpaddr, boolean isByte) {
    	synchronized (vdpCanvas) {
	    	vdpTouches.set(vdpaddr);
	    	if (!isByte)
	    		vdpTouches.set(vdpaddr + 1);
	    	//long now = System.currentTimeMillis();
	    	//if (now >= nextTouchFlushTime) {
	    	//	flushVdpChanges();
	    	//	nextTouchFlushTime = now + 1000;
	    	//}
    	}
    }
    
	protected void dirtySprites() {
File
VdpTMS9918ACanvasRenderer.java
Developer's decision
Version 1
Kind of conflict
Comment
Method signature
Synchronized statement