synchronized with original BlackBox 1.6

diff --git a/README b/README
index 066db262db189ee0d44605d8fb5f483f2a5f2efe..e510349b822c2d29fb09a449867e7a3c6b27b174 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,18 @@
 old: old branch based on BlackBox.Linux.20050512.zip; will be removed later
 
 new: head branch, mostly based on Trurl work done in 2006
-       synchronized with original BlackBox-1.6
+       synchronized with original BlackBox 1.6
 
-ubuntu: old (1.6-rc6) copy of "new" branch for Ubuntu
+ubuntu: copy of "new" branch for Ubuntu, synchronized with bb16base-core.7z
+       these files differ between bb16base-core.7z and original BlackBox 1.6:
+               Dev/Mod/Commanders.odc
+               Dev/Mod/Compiler.odc
+               Dev/Mod/Debug.odc
+               Dev/Mod/Packer.odc
+               Sql/Mod/DB.odc
+               Sql/Mod/Odbc3.odc
+               Std/Mod/Folds.odc
+               Std/Mod/Links.odc
+               Std/Mod/Stamps.odc
+               System/Mod/Windows.odc
        maintainer of this branch is Ivan Denisov

diff --git a/new/_LinuxOpenBSD_GUI/TODO.odc b/new/_LinuxOpenBSD_GUI/TODO.odc
index d2c12805b8d855c03fba475367e7d3ffe1e41c9e..bfa85d868e9d8781a1bcf77fafd8412ac3f453bb 100644 (file)
Binary files a/new/_LinuxOpenBSD_GUI/TODO.odc and b/new/_LinuxOpenBSD_GUI/TODO.odc differ

diff --git a/ubuntu/Dev/Docu/Debug.odc b/ubuntu/Dev/Docu/Debug.odc
index 5e9e53dca02446ec367fe03286e28cd631ff6946..b80430b7e19bf18509a1a86b93b36aca9335c857 100644 (file)
Binary files a/ubuntu/Dev/Docu/Debug.odc and b/ubuntu/Dev/Docu/Debug.odc differ

diff --git a/ubuntu/Dev/Mod/CPC486.odc b/ubuntu/Dev/Mod/CPC486.odc
index 39ba9a51661728d82fb95f8600ecc84d0586834f..1dc3be83817dbc155a1f6f7b77309ef266692793 100644 (file)
Binary files a/ubuntu/Dev/Mod/CPC486.odc and b/ubuntu/Dev/Mod/CPC486.odc differ

diff --git a/ubuntu/Dev/Mod/Linker.odc b/ubuntu/Dev/Mod/Linker.odc
index 7b642598fc26e59cd9c7b5088b4f654d55f66bdf..3b52502fbb777a13e47ca882cc30011d051fd7af 100644 (file)
Binary files a/ubuntu/Dev/Mod/Linker.odc and b/ubuntu/Dev/Mod/Linker.odc differ

diff --git a/ubuntu/Dev/Mod/Selectors.odc b/ubuntu/Dev/Mod/Selectors.odc
index a6153670d4a318e2b73802529974c3ea06e67575..055509aa2ac9415d20ea82c81fae91ce6bf29718 100644 (file)
Binary files a/ubuntu/Dev/Mod/Selectors.odc and b/ubuntu/Dev/Mod/Selectors.odc differ

diff --git a/ubuntu/Dev/Spec/PackedFiles.odc b/ubuntu/Dev/Spec/PackedFiles.odc
index 1759a8324e0f5aedc9111ad208db3c6d6e9d803f..2ac43cd61778442d5959445c2723eb3696b74d09 100644 (file)
Binary files a/ubuntu/Dev/Spec/PackedFiles.odc and b/ubuntu/Dev/Spec/PackedFiles.odc differ

diff --git a/ubuntu/Docu/BB-License.odc b/ubuntu/Docu/BB-License.odc
index f5847d58b6c77bd7a7606c433c313622b801c3a5..b30b9158f4088ca49449955d384583a43c503fee 100644 (file)
Binary files a/ubuntu/Docu/BB-License.odc and b/ubuntu/Docu/BB-License.odc differ

diff --git a/ubuntu/Docu/BB-Licensing-Policy.odc b/ubuntu/Docu/BB-Licensing-Policy.odc
deleted file mode 100644 (file)
index f1d0966..0000000
Binary files a/ubuntu/Docu/BB-Licensing-Policy.odc and /dev/null differ

diff --git a/ubuntu/Docu/BB-Open-Source-License.odc b/ubuntu/Docu/BB-Open-Source-License.odc
deleted file mode 100644 (file)
index f5847d5..0000000
Binary files a/ubuntu/Docu/BB-Open-Source-License.odc and /dev/null differ

diff --git a/ubuntu/Docu/CP-Lang.odc b/ubuntu/Docu/CP-Lang.odc
index 029e7a6f174c88f92e79fca80c42dc12f3ab82f2..26f512fa18708ca0bf14a045fb0196f127101239 100644 (file)
Binary files a/ubuntu/Docu/CP-Lang.odc and b/ubuntu/Docu/CP-Lang.odc differ

diff --git a/ubuntu/Docu/Contributors.odc b/ubuntu/Docu/Contributors.odc
index 4461178fc8365ea2e97965fd3bd1509e9c42701e..cfcd4efcbabd66aa027a962f580a9fdf0b4c1533 100644 (file)
Binary files a/ubuntu/Docu/Contributors.odc and b/ubuntu/Docu/Contributors.odc differ

diff --git a/ubuntu/Docu/Help.odc b/ubuntu/Docu/Help.odc
index 97b3a6c549e28afb0759e3aabe85e342c86a37db..a6b270b16da8e1a1e1876aaa4b50416f80df6378 100644 (file)
Binary files a/ubuntu/Docu/Help.odc and b/ubuntu/Docu/Help.odc differ

diff --git a/ubuntu/Docu/Tut-4.odc b/ubuntu/Docu/Tut-4.odc
index 84ac50545d6020d8f018058b06d0a13370c6829b..269ad5cce541d23585230d4fba7d5bf5957b2f8d 100644 (file)
Binary files a/ubuntu/Docu/Tut-4.odc and b/ubuntu/Docu/Tut-4.odc differ

diff --git a/ubuntu/Docu/Tut-6.odc b/ubuntu/Docu/Tut-6.odc
index 2561fe059168f1d5aa776c007821e240fcc133c1..fbaa7a9516cad05c74417d28e1bd7c5ab532c3b0 100644 (file)
Binary files a/ubuntu/Docu/Tut-6.odc and b/ubuntu/Docu/Tut-6.odc differ

diff --git a/ubuntu/Docu/Tut-Tot.odc b/ubuntu/Docu/Tut-Tot.odc
index be3c8e3c4172bb5a5ee0ec44add4467cd3c1cf5c..9f94fc5c2182503bf7ea591d8cb86ee2da79b1d1 100644 (file)
Binary files a/ubuntu/Docu/Tut-Tot.odc and b/ubuntu/Docu/Tut-Tot.odc differ

diff --git a/ubuntu/Host/Mod/DevPackedFiles.odc b/ubuntu/Host/Mod/DevPackedFiles.odc
deleted file mode 100644 (file)
index ded0d9c..0000000
Binary files a/ubuntu/Host/Mod/DevPackedFiles.odc and /dev/null differ

diff --git a/ubuntu/Host/Mod/PackedFiles.odc b/ubuntu/Host/Mod/PackedFiles.odc
index 0fcdfe2fcf8e02433e507c4011be797369620f8a..a4530a9098455a0d4f42c3e35885bb713883fcb8 100644 (file)
Binary files a/ubuntu/Host/Mod/PackedFiles.odc and b/ubuntu/Host/Mod/PackedFiles.odc differ

diff --git a/ubuntu/Obx/Docu/Omosi.odc b/ubuntu/Obx/Docu/Omosi.odc
index d6cd26a57926cc53f72e047cc5a797cf262433fd..775fc637c251e6f2522f8cabeab428061a040d97 100644 (file)
Binary files a/ubuntu/Obx/Docu/Omosi.odc and b/ubuntu/Obx/Docu/Omosi.odc differ

diff --git a/ubuntu/README.odc b/ubuntu/README.odc
index 929ad7c6c363511a68da10c6ad7728bc4a757f0c..93272f83fa6fbc163a98935ec1221d871258b945 100644 (file)
Binary files a/ubuntu/README.odc and b/ubuntu/README.odc differ

diff --git a/ubuntu/System/Docu/Containers.odc b/ubuntu/System/Docu/Containers.odc
index f01877804df7a4ef72878e749834693b229f1800..69342c46135fb46d509df55c91cf12bc46e41363 100644 (file)
Binary files a/ubuntu/System/Docu/Containers.odc and b/ubuntu/System/Docu/Containers.odc differ

diff --git a/ubuntu/System/Docu/Controllers.odc b/ubuntu/System/Docu/Controllers.odc
index fcef99f10495d6c0228a225f4f2dd0f57d672826..4e6e73d2eb7260e20963665ec79c7d0132dacb7c 100644 (file)
Binary files a/ubuntu/System/Docu/Controllers.odc and b/ubuntu/System/Docu/Controllers.odc differ

diff --git a/ubuntu/System/Docu/Controls.odc b/ubuntu/System/Docu/Controls.odc
index b2b7b2502d913055392cbe36a8afaea86b1eacfa..7bed3903615977692edf24d26ba65012c6bdbf6a 100644 (file)
Binary files a/ubuntu/System/Docu/Controls.odc and b/ubuntu/System/Docu/Controls.odc differ

diff --git a/ubuntu/System/Docu/Dates.odc b/ubuntu/System/Docu/Dates.odc
index 1871992ad4cd20933ee8520688bc10b64fc30364..6637c7209d3775be06ad56d194c7dc34e21cf6f3 100644 (file)
Binary files a/ubuntu/System/Docu/Dates.odc and b/ubuntu/System/Docu/Dates.odc differ

diff --git a/ubuntu/System/Docu/Models.odc b/ubuntu/System/Docu/Models.odc
index 19488ecb265e272151914b27364cedd48267f8b3..8504d089a86cf70d146ffd019dc5df477704bb12 100644 (file)
Binary files a/ubuntu/System/Docu/Models.odc and b/ubuntu/System/Docu/Models.odc differ

diff --git a/ubuntu/System/Docu/Stores.odc b/ubuntu/System/Docu/Stores.odc
index e1dd1c8f4bce2ee87f89ee2e33b3a46e50bce63a..bd2c0560b1537103f1839e3470b3a90bf74bb372 100644 (file)
Binary files a/ubuntu/System/Docu/Stores.odc and b/ubuntu/System/Docu/Stores.odc differ

diff --git a/ubuntu/System/Docu/Views.odc b/ubuntu/System/Docu/Views.odc
index 1cf4d7fe2135d460abd2ff8b08c8c670be17e4d1..d01ec548a3257e1f17dfa87975829262ce6b2b0b 100644 (file)
Binary files a/ubuntu/System/Docu/Views.odc and b/ubuntu/System/Docu/Views.odc differ

diff --git a/ubuntu/System/Mod/Kernel.odc b/ubuntu/System/Mod/Kernel.odc
index 04d559098d2922af95d29e7f762d9238d39ebdc3..775a24d03aa49c3dcdde3ac68f9eab31ca023bb9 100644 (file)
Binary files a/ubuntu/System/Mod/Kernel.odc and b/ubuntu/System/Mod/Kernel.odc differ

diff --git a/ubuntu/System/Rsrc/About.odc b/ubuntu/System/Rsrc/About.odc
index b41b29dc9468c6606eb8ea56037ff8f9ae92a4bc..e395bd2d5ef4c2ddc1145a96e932779b024a6e12 100644 (file)
Binary files a/ubuntu/System/Rsrc/About.odc and b/ubuntu/System/Rsrc/About.odc differ

diff --git a/ubuntu/Tour.odc b/ubuntu/Tour.odc
index f6c907ca3d85172715940becb34efc0e82e566bc..119558892f65750ee51640668a10cf05d01ba0a6 100644 (file)
Binary files a/ubuntu/Tour.odc and b/ubuntu/Tour.odc differ