ViewVC Help
|
View Changeset
|
Root Listing
root
/
src
Jump to revision:
Author:
laffer1
Date:
Sat Jul 21 16:50:01 2012 UTC
(11 years, 10 months ago)
Log Message:
Resolve conflicts
Changed paths
Path
Details
trunk/sys/boot/i386/libfirewire/firewire.c
modified
,
text changed
,
props changed
trunk/sys/boot/sparc64/Makefile.inc
modified
,
text changed
,
props changed
trunk/sys/boot/sparc64/loader/Makefile
modified
,
text changed
,
props changed
trunk/sys/boot/sparc64/loader/main.c
modified
,
text changed
,
props changed