diff options
| author | Alexis211 <alexis211@gmail.com> | 2009-10-20 19:23:33 +0200 |
|---|---|---|
| committer | Alexis211 <alexis211@gmail.com> | 2009-10-20 19:23:33 +0200 |
| commit | 768ada13917aeda373e6ff5fee21faf90c963746 (patch) | |
| tree | 9e26d7d65e1693d1a7f9fd93c9fd33b41d175464 /Source/Kernel/Devices/Display | |
| parent | 6ec4b3d31080f90393e72989d559cfb76eff6f9d (diff) | |
| parent | 9836acd720988af30250c2c1ec18d618664dea4e (diff) | |
| download | Melon-768ada13917aeda373e6ff5fee21faf90c963746.tar.gz Melon-768ada13917aeda373e6ff5fee21faf90c963746.zip | |
Merge branch 'usermode_syscalls'
Conflicts:
Source/Kernel/Makefile
Diffstat (limited to 'Source/Kernel/Devices/Display')
| -rw-r--r-- | Source/Kernel/Devices/Display/Display.proto.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Kernel/Devices/Display/Display.proto.h b/Source/Kernel/Devices/Display/Display.proto.h index d4bd8fc..2cec616 100644 --- a/Source/Kernel/Devices/Display/Display.proto.h +++ b/Source/Kernel/Devices/Display/Display.proto.h @@ -1,9 +1,9 @@ #ifndef DEF_DISPLAY_PROTO_H #define DEF_DISPLAY_PROTO_H -#include <Core/common.wtf.h> +#include <common.h> #include <Devices/Device.proto.h> -#include <Library/WChar.class.h> +#include <WChar.class.h> class Display : public Device { public: |