From 837ce8b9c779b1da6e4390220ccd353b289c1fca Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Wed, 20 Dec 2017 09:11:31 -0600
Subject: Bring in some earlier work - mostly documentation and startup
 handling

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'VERSION')

diff --git a/VERSION b/VERSION
index 3e0b7cab..6a5fe6e8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.10-pre4
+2.11
-- 
cgit v1.2.3


From a2325f723052ff951200020f9b072a2dd5140c01 Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Wed, 20 Dec 2017 10:14:35 -0600
Subject: VERSION

---
 VERSION     | 2 +-
 etc/VERSION | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 mode change 100644 => 120000 VERSION

(limited to 'VERSION')

diff --git a/VERSION b/VERSION
deleted file mode 100644
index 6a5fe6e8..00000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-2.11
diff --git a/VERSION b/VERSION
new file mode 120000
index 00000000..a9a7884c
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+etc/VERSION
\ No newline at end of file
diff --git a/etc/VERSION b/etc/VERSION
index 1785aa28..b624c74a 100644
--- a/etc/VERSION
+++ b/etc/VERSION
@@ -1 +1 @@
-2.10rc3
+2.10rc5
-- 
cgit v1.2.3