projects
/
egate.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed order yet again
[egate.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
12126bc
..
384ffb7
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-2,7
+2,10
@@
# Europagate, 1994-1995.
#
# $Log: Makefile,v $
# Europagate, 1994-1995.
#
# $Log: Makefile,v $
-# Revision 1.9 1995/02/16 18:35:43 quinn
+# Revision 1.10 1995/02/16 18:36:18 quinn
+# Changed order yet again
+#
+# Revision 1.9 1995/02/16 18:35:43 quinn
# Changing order.
#
# Revision 1.8 1995/02/16 18:34:06 adam
# Changing order.
#
# Revision 1.8 1995/02/16 18:34:06 adam
@@
-31,13
+34,7
@@
#
SHELL=/bin/sh
MAKE=make
#
SHELL=/bin/sh
MAKE=make
-<<<<<<< Makefile
SUBDIR=res+log util fml ccl zlayer kernel
SUBDIR=res+log util fml ccl zlayer kernel
-||||||| 1.8
-SUBDIR=res+log util fml ccl kernel zlayer
-=======
-SUBDIR=res+log util fml ccl zlayer kernel
->>>>>>> /tmp/T4a24364
CFLAGS=-Wall -g -pedantic -ansi
#CC=gcc
CFLAGS=-Wall -g -pedantic -ansi
#CC=gcc