diff options
| author | Alexis211 <alexis211@gmail.com> | 2009-09-20 14:27:07 +0200 |
|---|---|---|
| committer | Alexis211 <alexis211@gmail.com> | 2009-09-20 14:27:07 +0200 |
| commit | af3ff7f8c80bb3953f261a602316f92ec662daa8 (patch) | |
| tree | 6321339875d7bd3aa4d03ab0ae11b20f037459d2 /Source/Kernel/DeviceManager | |
| parent | 82fec280c2ceba890ea794f5a5917877677fb984 (diff) | |
| parent | 1eb942c8a34166e43f43c843f09bb48ba40b65b2 (diff) | |
| download | Melon-af3ff7f8c80bb3953f261a602316f92ec662daa8.tar.gz Melon-af3ff7f8c80bb3953f261a602316f92ec662daa8.zip | |
Merge branch 'advt'
Conflicts:
Source/Kernel/Melon.ke
Source/Kernel/VTManager/SimpleVT.class.cpp
Source/Kernel/VTManager/VirtualTerminal.proto.h
Diffstat (limited to 'Source/Kernel/DeviceManager')
| -rw-r--r-- | Source/Kernel/DeviceManager/Kbd.ns.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Kernel/DeviceManager/Kbd.ns.cpp b/Source/Kernel/DeviceManager/Kbd.ns.cpp index 95a97e3..fddf0dd 100644 --- a/Source/Kernel/DeviceManager/Kbd.ns.cpp +++ b/Source/Kernel/DeviceManager/Kbd.ns.cpp @@ -2,7 +2,7 @@ #include <DeviceManager/Dev.ns.h> #include <Library/Vector.class.h> #include <Devices/Keyboard/Keyboard.proto.h> -#include <VTManager/VirtualTerminal.class.h> +#include <VTManager/VirtualTerminal.proto.h> namespace Kbd { |