Merge branch 'master' of git://git.etherboot.org/scm/gpxe
authorPravin Shinde <pravin@BlackPearl.(none)>
Sat, 23 Jan 2010 02:18:18 +0000 (20:18 -0600)
committerPravin Shinde <pravin@BlackPearl.(none)>
Sat, 23 Jan 2010 02:18:18 +0000 (20:18 -0600)
1  2 
src/Makefile
src/config/general.h

diff --cc src/Makefile
Simple merge
Simple merge