git.ipfire.org Git - thirdparty/grub.git/commit

]> git.ipfire.org Git - thirdparty/grub.git/commit

projects / thirdparty / grub.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 07e727f 8dd35b8)

author	Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
	Wed, 20 Jan 2010 20:31:39 +0000 (21:31 +0100)
committer	Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
	Wed, 20 Jan 2010 20:31:39 +0000 (21:31 +0100)
commit	61c501a94151d1830743200efc87f21e69cbbfc9
tree	f5b27c397d9a490c7be5cb307eb6ce639a97fa1d	tree
parent	07e727f751028b3f9cdfa2c0ab892b8307e41d2b	commit \| diff
parent	8dd35b8c20433a2ad470ece6a685bac5ee8626f4	commit \| diff

merge mainline into newenv

14 files changed:

conf/any-emu.rmk	diff1 \|	diff2 \|	blob \| history
conf/common.rmk	diff1 \|	diff2 \|	blob \| history
conf/i386-coreboot.rmk	diff1 \|	diff2 \|	blob \| history
conf/i386-efi.rmk	diff1 \|	diff2 \|	blob \| history
conf/i386-ieee1275.rmk	diff1 \|	diff2 \|	blob \| history
conf/i386-pc.rmk	diff1 \|	diff2 \|	blob \| history
conf/powerpc-ieee1275.rmk	diff1 \|	diff2 \|	blob \| history
conf/sparc64-ieee1275.rmk	diff1 \|	diff2 \|	blob \| history
conf/x86_64-efi.rmk	diff1 \|	diff2 \|	blob \| history
include/grub/normal.h	diff1 \|	diff2 \|	blob \| history
kern/corecmd.c	diff1 \|	diff2 \|	blob \| history
kern/env.c	diff1 \|	diff2 \|	blob \| history
kern/main.c	diff1 \|	diff2 \|	blob \| history
normal/main.c	diff1 \|	diff2 \|	blob \| history

Mirror of https://git.savannah.gnu.org/git/grub.git