# 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
#
SHELL=/bin/sh
MAKE=make
-<<<<<<< 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