[Brlcad-commits] CVS: brlcad/misc/win32-msvc Makefile.am,1.1.6.1,1.1.6.2

[Sean M. <br...@us...>]

Update of /cvsroot/brlcad/brlcad/misc/win32-msvc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv633/misc/win32-msvc

Modified Files:
      Tag: rel-7-6-branch
	Makefile.am 
Log Message:
more merging changes from HEAD aka rel-7-6-4 to the rel-7-6-branch, adding the items that were moved and resolving rcs keyword conflicts

Index: Makefile.am
===================================================================
RCS file: /cvsroot/brlcad/brlcad/misc/win32-msvc/Makefile.am,v
retrieving revision 1.1.6.1
retrieving revision 1.1.6.2
diff -w -u -r1.1.6.1 -r1.1.6.2
--- Makefile.am	13 Nov 2005 13:46:10 -0000	1.1.6.1
+++ Makefile.am	13 Nov 2005 17:44:59 -0000	1.1.6.2
@@ -2,6 +2,8 @@
 
 SUBDIRS = Dll
 
+SUBDIRS = Dll
+
 EXTRA_DIST = \
 	brlcad.dsw \
 	vers.vbs