Merged dlls/ver into dlls/version.

Makefile.in

diff --git a/Makefile.in b/Makefile.in
index c5a248b..bd2af5e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -62,7 +62,6 @@
 	dlls/sound \
 	dlls/stress \
 	dlls/tapi32 \
-	dlls/ver \
 	dlls/version \
 	dlls/win32s \
 	dlls/win87em \
@@ -177,7 +176,6 @@
 	dlls/sound/sound.o \
 	dlls/stress/stress.o \
 	dlls/tapi32/tapi32.o \
-	dlls/ver/ver.o \
 	dlls/version/version.o \
 	dlls/win32s/win32s.o \
 	dlls/win87em/win87em.o \

configure

diff --git a/configure b/configure
index 613c395..070415f 100755
--- a/configure
+++ b/configure
@@ -6106,7 +6106,6 @@
 dlls/sound/Makefile
 dlls/stress/Makefile
 dlls/tapi32/Makefile
-dlls/ver/Makefile
 dlls/version/Makefile
 dlls/win32s/Makefile
 dlls/win87em/Makefile
@@ -6317,7 +6316,6 @@
 dlls/sound/Makefile
 dlls/stress/Makefile
 dlls/tapi32/Makefile
-dlls/ver/Makefile
 dlls/version/Makefile
 dlls/win32s/Makefile
 dlls/win87em/Makefile

configure.in

diff --git a/configure.in b/configure.in
index 308fcc5..e2db0a3 100644
--- a/configure.in
+++ b/configure.in
@@ -934,7 +934,6 @@
 dlls/sound/Makefile
 dlls/stress/Makefile
 dlls/tapi32/Makefile
-dlls/ver/Makefile
 dlls/version/Makefile
 dlls/win32s/Makefile
 dlls/win87em/Makefile

dlls/Makefile.in

diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 807c8af..ed6bf3e 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -30,7 +30,6 @@
 	sound \
 	stress \
 	tapi32 \
-	ver \
 	version \
 	win32s \
 	win87em \

dlls/ver/.cvsignore

diff --git a/dlls/ver/.cvsignore b/dlls/ver/.cvsignore
deleted file mode 100644
index 227d839..0000000
--- a/dlls/ver/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-*.spec.c
-*.spec.glue.s

dlls/ver/Makefile.in

diff --git a/dlls/ver/Makefile.in b/dlls/ver/Makefile.in
deleted file mode 100644
index b2f27c2..0000000
--- a/dlls/ver/Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-DEFS      = @DLLFLAGS@ -D__WINE__
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../..
-SRCDIR    = @srcdir@
-VPATH     = @srcdir@
-MODULE    = ver
-
-SPEC_SRCS = ver.spec
-
-C_SRCS = \
-	ver16.c
-
-all: $(MODULE).o
-
-@MAKE_RULES@
-
-### Dependencies:

dlls/version/Makefile.in

diff --git a/dlls/version/Makefile.in b/dlls/version/Makefile.in
index ce74c6c..07dbeee 100644
--- a/dlls/version/Makefile.in
+++ b/dlls/version/Makefile.in
@@ -5,12 +5,13 @@
 VPATH     = @srcdir@
 MODULE    = version
 
-SPEC_SRCS = version.spec
+SPEC_SRCS = ver.spec version.spec
 
 C_SRCS = \
 	info.c \
 	install.c \
-	resource.c
+	resource.c \
+	ver16.c
 
 all: $(MODULE).o
 

dlls/version/ver.spec

diff --git a/dlls/ver/ver.spec b/dlls/version/ver.spec
similarity index 100%
rename from dlls/ver/ver.spec
rename to dlls/version/ver.spec

dlls/version/ver16.c

diff --git a/dlls/ver/ver16.c b/dlls/version/ver16.c
similarity index 100%
rename from dlls/ver/ver16.c
rename to dlls/version/ver16.c