Public Git Hosting - lsnes.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 0f56afb b1c2441)

commit	4fc30a3c4cc66f84411a67daa53ac127ffbc5baa
author	Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
	Fri, 2 Mar 2012 20:00:20 +0000 (2 22:00 +0200)
committer	Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
	Fri, 2 Mar 2012 20:00:20 +0000 (2 22:00 +0200)
tree	15b628318f8956c94ea3bb26298cf1c1bc22fecb	tree \| snapshot (tar.gz zip)
parent	0f56afbffde95ff8153c3f32f43d1c3374a4fe07	commit \| diff
parent	b1c2441da4de056f491bdf5845f06ec8713f8cab	commit \| diff

Merge branch 'rr1-maint'

Conflicts:
Makefile
src/core/avidump-control.cpp
src/core/jmd-control.cpp
src/core/keymapper.cpp
src/core/raw-control.cpp
src/core/rom.cpp

Makefile	diff1 \|	diff2 \|	blob \| history
src/core/advdumper.cpp	diff1 \|	diff2 \|	blob \| history
src/core/keymapper.cpp	diff1 \|	diff2 \|	blob \| history
src/core/moviedata.cpp	diff1 \|	diff2 \|	blob \| history
src/core/rom.cpp	diff1 \|	diff2 \|	blob \| history
src/core/window.cpp	diff1 \|	diff2 \|	blob \| history
src/platform/sdl/Makefile	diff1 \|	\|	blob \| history

Rerecording SNES/GB(C) emulator based on bsnes / gambatte core