Public Git Hosting - kugel-rb.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 380dffb a771227)

commit	5e93b61e573bfa6a852c1aa5f803f63adc506210
author	Thomas Martitz <thomas.martitz@student.htw-berlin.de>
	Sun, 1 Aug 2010 15:00:10 +0000 (1 17:00 +0200)
committer	Thomas Martitz <thomas.martitz@student.htw-berlin.de>
	Sun, 1 Aug 2010 15:00:10 +0000 (1 17:00 +0200)
tree	470414b66ba1ab8327b7f2fff42ebb05b5a5696f	tree \| snapshot (tar.gz zip)
parent	380dffb9cad5a16b46895c7baf26b0b3f31596c7	commit \| diff
parent	a7712272ad802d9c71ecb448bcfad583b1a908ff	commit \| diff

Merge branch 'master' into gsoc-dir-split

apps/gui/skin_engine/skin_fonts.c	diff1 \|	diff2 \|	blob \| history
apps/gui/skin_engine/skin_parser.c	diff1 \|	diff2 \|	blob \| history
apps/gui/theme_settings.c	diff1 \|	diff2 \|	blob \| history
apps/main.c	diff1 \|	diff2 \|	blob \| history
apps/menus/main_menu.c	diff1 \|	diff2 \|	blob \| history
apps/misc.c	diff1 \|	diff2 \|	blob \| history
apps/misc.h	diff1 \|	diff2 \|	blob \| history
apps/settings.h	diff1 \|	diff2 \|	blob \| history
tools/configure	diff1 \|	diff2 \|	blob \| history
tools/root.make	diff1 \|	diff2 \|	blob \| history

My public Rockbox git repo