From: Alexander Shiryaev Date: Thu, 17 Oct 2013 05:53:09 +0000 (+0400) Subject: synchronized with original BlackBox 1.6 X-Git-Url: http://deadsoftware.ru/gitweb?a=commitdiff_plain;h=db5aa9d8bd2b8ed72a2b35668733134aa9223f49;p=bbcp.git synchronized with original BlackBox 1.6 --- diff --git a/README b/README index 066db26..e510349 100644 --- 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 d2c1280..bfa85d8 100644 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 5e9e53d..b80430b 100644 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 39ba9a5..1dc3be8 100644 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 7b64259..3b52502 100644 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 a615367..055509a 100644 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 1759a83..2ac43cd 100644 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 f5847d5..b30b915 100644 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 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 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 029e7a6..26f512f 100644 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 4461178..cfcd4ef 100644 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 97b3a6c..a6b270b 100644 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 84ac505..269ad5c 100644 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 2561fe0..fbaa7a9 100644 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 be3c8e3..9f94fc5 100644 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 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 0fcdfe2..a4530a9 100644 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 d6cd26a..775fc63 100644 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 929ad7c..93272f8 100644 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 f018778..69342c4 100644 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 fcef99f..4e6e73d 100644 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 b2b7b25..7bed390 100644 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 1871992..6637c72 100644 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 19488ec..8504d08 100644 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 e1dd1c8..bd2c056 100644 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 1cf4d7f..d01ec54 100644 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 04d5590..775a24d 100644 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 b41b29d..e395bd2 100644 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 f6c907c..1195588 100644 Binary files a/ubuntu/Tour.odc and b/ubuntu/Tour.odc differ