Public Git Hosting - kugel-rb.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: fa37b2f e23f826)

commit	df9e1147c480fe3140f8d21a707439d933eb795d
author	Thomas Martitz <thomas.martitz@student.htw-berlin.de>
	Sat, 19 Jun 2010 14:29:37 +0000 (19 16:29 +0200)
committer	Thomas Martitz <thomas.martitz@student.htw-berlin.de>
	Sat, 19 Jun 2010 14:29:37 +0000 (19 16:29 +0200)
tree	c1b45a3888785291dc8cdb4e3bdb0213627512fb	tree \| snapshot (tar.gz zip)
parent	fa37b2fa6b5836dca713a3672ffca40a08509499	commit \| diff
parent	e23f8268c08ada234b3e042857cc70d3dc0aa5e7	commit \| diff

Merge branch 'gsoc-ifdef-cleanup' into gsoc-app-target

Conflicts:
firmware/target/hosted/sdl/app/button-target.h
firmware/target/hosted/sdl/button-sdl.c

apps/debug_menu.c	diff1 \|	diff2 \|	blob \| history
firmware/SOURCES	diff1 \|	diff2 \|	blob \| history
firmware/export/config.h	diff1 \|	diff2 \|	blob \| history
firmware/target/hosted/sdl/button-sdl.c	diff1 \|	diff2 \|	blob \| history
tools/configure	diff1 \|	diff2 \|	blob \| history
uisimulator/uisimulator.make	diff1 \|	diff2 \|	blob \| history

My public Rockbox git repo