Public Git Hosting - jpcrr.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: d2331d3 43da017)

commit	1bbf90c6a6e3c729d54fe2afda317fbb4285d38b
author	Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
	Sat, 5 Jun 2010 23:15:44 +0000 (6 02:15 +0300)
committer	Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
	Sat, 5 Jun 2010 23:16:43 +0000 (6 02:16 +0300)
tree	6788c900e6c837b7d8b9b19d44febd1fad1bd8b6	tree \| snapshot (tar.gz zip)
parent	d2331d39008339f312fec826f0b4a8807d3dfa6d	commit \| diff
parent	43da01703788dda382e6bbd002e702892529c469	commit \| diff

Merge fixes in r10.10

Conflicts:
Changelog.utf8
assemble.jpcrrinit
org/jpc/plugins/PCControl.java

Changelog.utf8	diff1 \|	diff2 \|	blob \| history
assemble.jpcrrinit	diff1 \|	diff2 \|	blob \| history
datafiles/luakernel	diff1 \|	diff2 \|	blob \| history
org/jpc/plugins/PCControl.java	diff1 \|	diff2 \|	blob \| history
org/jpc/pluginsbase/Plugins.java	diff1 \|	diff2 \|	blob \| history

JPC-RR: Rerecording version of JPC X86 emulator