]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
merge trunk into newenv
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sun, 20 Dec 2009 13:20:37 +0000 (14:20 +0100)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sun, 20 Dec 2009 13:20:37 +0000 (14:20 +0100)
1  2 
include/grub/normal.h
normal/main.c

Simple merge
diff --cc normal/main.c
Simple merge