21 Jul 2012 18:23
src: i386/loader: resolve conflicts
<laffer1 <at> midnightbsd.org>
2012-07-21 16:23:10 GMT
2012-07-21 16:23:10 GMT
Log Message:
-----------
resolve conflicts
Modified Files:
--------------
src/sys/boot/i386/loader:
Makefile (r1.4 -> r1.5)
(http://cvsweb.midnightbsd.org/src/sys/boot/i386/loader/Makefile?r1=1.4&r2=1.5)
main.c (r1.2 -> r1.3)
(http://cvsweb.midnightbsd.org/src/sys/boot/i386/loader/main.c?r1=1.2&r2=1.3)
Log Message:
-----------
resolve conflicts
Modified Files:
--------------
src/sys/boot/i386/loader:
Makefile (r1.4 -> r1.5)
(http://cvsweb.midnightbsd.org/src/sys/boot/i386/loader/Makefile?r1=1.4&r2=1.5)
main.c (r1.2 -> r1.3)
(http://cvsweb.midnightbsd.org/src/sys/boot/i386/loader/main.c?r1=1.2&r2=1.3)
RSS Feed