diff options
| author | Amlal EL Mahrouss. <113760121+amlel-el-mahrouss@users.noreply.github.com> | 2024-11-29 22:18:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-29 22:18:51 +0100 |
| commit | 65a138dde55e69cf5292c0601f37d023003e74e2 (patch) | |
| tree | fc2f1e9fa9232693785452d4a1e887ff06d36b6a | |
| parent | 2aee9f4725e5daa325dd1d63e4e30c9b037502a4 (diff) | |
| parent | 8e42fab37245bb27786191600d4a3dc39783eece (diff) | |
Merge branch 'master' into unstable
| -rw-r--r-- | dev/ZBAKit/src/BootloaderRsrc.rsrc | 4 | ||||
| -rw-r--r-- | dev/ZKAKit/KernelRsrc.rsrc | 4 | ||||
| -rw-r--r-- | dev/ZKAKit/src/IPEFDLLObject.cc | 4 | ||||
| -rw-r--r-- | dev/ZKAKit/src/Json.cc | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/dev/ZBAKit/src/BootloaderRsrc.rsrc b/dev/ZBAKit/src/BootloaderRsrc.rsrc index bc1ede9b..5f6547b6 100644 --- a/dev/ZBAKit/src/BootloaderRsrc.rsrc +++ b/dev/ZBAKit/src/BootloaderRsrc.rsrc @@ -1,4 +1,4 @@ -#include "../../Kernel/CompilerKit/Version.h" +#include "../../ZKAKit/CompilerKit/Version.h" 1 VERSIONINFO FILEVERSION 1,0,0,0 @@ -12,7 +12,7 @@ BEGIN VALUE "FileDescription", "ZKA OS Loader." VALUE "FileVersion", BOOTLOADER_VERSION VALUE "InternalName", "zbaosldr" - VALUE "LegalCopyright", "Copyright (C) 2024, ELMH Group, all rights reserved., all rights reserved." + VALUE "LegalCopyright", "Copyright (C) 2024, ELMH Group all rights reserved." VALUE "OriginalFilename", "zbaosldr.exe" VALUE "ProductName", "zbaosldr" VALUE "ProductVersion", BOOTLOADER_VERSION diff --git a/dev/ZKAKit/KernelRsrc.rsrc b/dev/ZKAKit/KernelRsrc.rsrc index 8e5ded4e..fbddae85 100644 --- a/dev/ZKAKit/KernelRsrc.rsrc +++ b/dev/ZKAKit/KernelRsrc.rsrc @@ -12,9 +12,9 @@ BEGIN VALUE "FileDescription", "ZKA Minimal Kernel." VALUE "FileVersion", KERNEL_VERSION VALUE "InternalName", "minoskrnl" - VALUE "LegalCopyright", "(c) ELMH Group, all rights reserved." + VALUE "LegalCopyright", "(c) 2024 ELMH Group, all rights reserved." VALUE "OriginalFilename", "minoskrnl.exe" - VALUE "ProductName", "ZKA Operating System Kernel." + VALUE "ProductName", "ZKA Minimal Kernel." VALUE "ProductVersion", KERNEL_VERSION END END diff --git a/dev/ZKAKit/src/IPEFDLLObject.cc b/dev/ZKAKit/src/IPEFDLLObject.cc index 57e15a4d..89b613ac 100644 --- a/dev/ZKAKit/src/IPEFDLLObject.cc +++ b/dev/ZKAKit/src/IPEFDLLObject.cc @@ -31,8 +31,8 @@ using namespace Kernel; /***********************************************************************************/ -/// @file PEFSharedObjectRT.cc -/// @brief PEF's shared object runtime. +/// @file IPEFDLLObject.cc +/// @brief PEF's DLL runtime. /***********************************************************************************/ /***********************************************************************************/ diff --git a/dev/ZKAKit/src/Json.cc b/dev/ZKAKit/src/Json.cc index e1cfc291..9048e019 100644 --- a/dev/ZKAKit/src/Json.cc +++ b/dev/ZKAKit/src/Json.cc @@ -6,7 +6,5 @@ #include <NewKit/Json.h> -using namespace Kernel; - /// @brief Undefined object, is null in length. INIT_OBJECT(Kernel::JSON::kNull, Kernel::JSON); |