X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=Makefile;h=12126bc08972021cb05ceabb742d93b1207dd432;hb=354551f6bf617eb9c44c341574c60e0ff5b4fd3b;hp=da2c6abc478a2df6f1f2a0ebf57ab177d4273a64;hpb=7c9f7973de8cafa30923239a80fe36c00d278ec5;p=egate.git

diff --git a/Makefile b/Makefile
index da2c6ab..12126bc 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,16 @@
 # Europagate, 1994-1995.
 #
 # $Log: Makefile,v $
-# Revision 1.6  1995/02/16 14:47:31  quinn
+# Revision 1.9  1995/02/16 18:35:43  quinn
+# Changing order.
+#
+# Revision 1.8  1995/02/16  18:34:06  adam
+# Minor changes.
+#
+# Revision 1.7  1995/02/16  15:01:26  quinn
+# Added zlayer
+#
+# Revision 1.6  1995/02/16  14:47:31  quinn
 # Removed CC
 #
 # Revision 1.5  1995/02/15  17:40:47  adam
@@ -22,7 +31,13 @@
 #
 SHELL=/bin/sh
 MAKE=make
-SUBDIR=res+log util fml ccl kernel
+<<<<<<< Makefile
+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