]> git.ipfire.org Git - thirdparty/grub.git/commit
fix mismerge with trunk (progname)
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sat, 5 Dec 2009 17:59:36 +0000 (18:59 +0100)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sat, 5 Dec 2009 17:59:36 +0000 (18:59 +0100)
commitfd39f820fdbd4fdb9d82cdc6befecdd25904709a
tree0afe41e7481c58ea822bfca5989445ce2c335dd6
parent7d624c2949d502e3600ac153dcd7bea99103daa0
fix mismerge with trunk (progname)
conf/common.rmk
util/grub-mkpasswd-pbkdf2.c