Merge branch 'softres'
authorH. Peter Anvin <hpa@zytor.com>
Tue, 8 Dec 2009 00:23:22 +0000 (16:23 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 8 Dec 2009 00:23:22 +0000 (16:23 -0800)
commit2f74a2a8b56622951b2bad1ca19e61ad02eb9f03
tree0208468772b4cffef6819d36b07f0b4ac9abb673
parent2c36092660d8666a2a50c73da66717208b94eb4f
parent66a4a0bab62d10c66386c1f879a606366c5aea99
Merge branch 'softres'
com32/lib/Makefile
com32/menu/menu.h
com32/menu/menumain.c
com32/menu/readconfig.c