]> Joshua Wise's Git repositories - netwatch.git/commitdiff
merge
authorJoshua Wise <joshua@rebirth.joshuawise.com>
Fri, 19 Sep 2008 20:16:02 +0000 (16:16 -0400)
committerJoshua Wise <joshua@rebirth.joshuawise.com>
Fri, 19 Sep 2008 20:16:02 +0000 (16:16 -0400)
1  2 
aseg/Makefile
aseg/counter.c

diff --cc aseg/Makefile
index e2edc87ff61e7c09ade13d64603ad8cba167e069,6d22af1975279d9343206f2f6f3e4c2506f6e178..5806bd198994e7a59731342021d937ce55bf2e26
@@@ -1,6 -1,6 +1,6 @@@
  CC=gcc
  CFLAGS=-I../include -I../include/raw -nostdlib -nostdinc -fno-builtin -D__RAW__ -Wall -Werror -pedantic -ansi -std=gnu99
- OBJS=counter.o firstrun.o ../pci/pci-raw.o ../lib/minilib.o ../lib/console.o ../ich2/smram-ich2.o ../ich2/smi.o
 -OBJS=counter.o firstrun.o ../pci/pci-raw.o ../lib/minilib.o ../lib/console.o ../ich2/smram-ich2.o vga-overlay.o
++OBJS=counter.o firstrun.o ../pci/pci-raw.o ../lib/minilib.o ../lib/console.o ../ich2/smram-ich2.o ../ich2/smi.o vga-overlay.o
  
  all: aseg.elf
  
diff --cc aseg/counter.c
Simple merge
This page took 0.028095 seconds and 4 git commands to generate.