Merge branch 'master' of git://git.etherboot.org/scm/gpxe
authorJoshua Oreman <oremanj@xenon.get-linux.org>
Sat, 2 May 2009 19:56:00 +0000 (12:56 -0700)
committerJoshua Oreman <oremanj@xenon.get-linux.org>
Sat, 2 May 2009 19:56:00 +0000 (12:56 -0700)
1  2 
src/Makefile
src/Makefile.housekeeping

diff --cc src/Makefile
Simple merge
Simple merge