From 2001f6982df5d0f54f282c535b9cc095fca55b42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A1roly=20Balogh?= Date: Sun, 31 Aug 2014 17:22:39 +0000 Subject: [PATCH] amunits: renamed keyboard.pas to akeyboard.pas to avoid name conflict with rtl-console/keyboard git-svn-id: trunk@28563 - --- .gitattributes | 2 +- packages/amunits/src/coreunits/{keyboard.pas => akeyboard.pas} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename packages/amunits/src/coreunits/{keyboard.pas => akeyboard.pas} (98%) diff --git a/.gitattributes b/.gitattributes index d8f9d197ba..a5deb44be6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1030,6 +1030,7 @@ packages/amunits/fpmake.pp svneol=native#text/plain packages/amunits/scripts/getrecord.rexx svneol=native#text/plain packages/amunits/scripts/make.rexx svneol=native#text/plain packages/amunits/src/coreunits/agraphics.pas svneol=native#text/plain +packages/amunits/src/coreunits/akeyboard.pas svneol=native#text/plain packages/amunits/src/coreunits/amigados.pas svneol=native#text/plain packages/amunits/src/coreunits/amigaguide.pas svneol=native#text/plain packages/amunits/src/coreunits/amigalib.pas svneol=native#text/plain @@ -1061,7 +1062,6 @@ packages/amunits/src/coreunits/iffparse.pas svneol=native#text/plain packages/amunits/src/coreunits/input.pas svneol=native#text/plain packages/amunits/src/coreunits/inputevent.pas svneol=native#text/plain packages/amunits/src/coreunits/intuition.pas svneol=native#text/plain -packages/amunits/src/coreunits/keyboard.pas svneol=native#text/plain packages/amunits/src/coreunits/keymap.pas svneol=native#text/plain packages/amunits/src/coreunits/layers.pas svneol=native#text/plain packages/amunits/src/coreunits/locale.pas svneol=native#text/plain diff --git a/packages/amunits/src/coreunits/keyboard.pas b/packages/amunits/src/coreunits/akeyboard.pas similarity index 98% rename from packages/amunits/src/coreunits/keyboard.pas rename to packages/amunits/src/coreunits/akeyboard.pas index 44aa83c6b1..5a56bbf36d 100644 --- a/packages/amunits/src/coreunits/keyboard.pas +++ b/packages/amunits/src/coreunits/akeyboard.pas @@ -18,7 +18,7 @@ Keyboard device command definitions } -unit keyboard; +unit akeyboard; INTERFACE