Sync up with 3.0

(This used to be commit 3cd8acb6c362bca82d7268aa283d3f6360b24604)

diff --git a/source3/include/.cvsignore b/source3/include/.cvsignore
index 3827fdf70da5f066b853a2b6f1ae987ac13627b4..7dff121f14338863e7821a978306d60cf7afe341 100644 (file)
--- a/source3/include/.cvsignore
+++ b/source3/include/.cvsignore
@@ -1,7 +1,7 @@
 build_env.h
 config.h
-config.h.in
-proto.h
 stamp-h
-version.h
+proto.h
 wrepld_proto.h
+config.h.in
+version.h