diff options
author | Reinhard Tartler <siretart@tauware.de> | 2017-06-11 21:52:33 -0400 |
---|---|---|
committer | Reinhard Tartler <siretart@tauware.de> | 2017-06-11 21:52:33 -0400 |
commit | e0eb815b67734abd09ff41e2271630d4b2a6d760 (patch) | |
tree | 0df971c34f98d2a1dfd0921524a17d561a4a6536 /VERSION.txt | |
parent | 676c9e1c9d4ac8eb8a440d7f11c4ac44f98f4a6a (diff) | |
parent | e19a5db232e1ef90e9a02159d2fbd9707ffe4373 (diff) |
merge upstream version 0.12
Diffstat (limited to 'VERSION.txt')
-rw-r--r-- | VERSION.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/VERSION.txt b/VERSION.txt index c29321a1..2201711b 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,2 +1,6 @@ +<<<<<<< HEAD USE_SVN_VERSION +======= +0.12 +>>>>>>> 0.12 boxbackup |