projects / platform / upstream / syslinux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cfebcd1 cdfd4a4)
Merge remote branch 'origin/master' into pathbased
authorH. Peter Anvin <hpa@zytor.com>
Fri, 5 Mar 2010 19:28:06 +0000 (11:28 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 5 Mar 2010 19:28:06 +0000 (11:28 -0800)
Resolved Conflicts:
version


Trivial merge
Domain: System / Base;