Merge branch 'master' of https://github.com/VARCem/VARCem

# Conflicts: # src/devices/input/keyboard_at.c
2019-04-23 00:43:03 -05:00
parent c4283927a7 d1a18152a3
commit 3a3bed7f96
1 changed files with 1 additions and 0 deletions
--- a/src/devices/input/keyboard_at.c
+++ b/src/devices/input/keyboard_at.c
@@ -2152,6 +2152,7 @@ const device_t keyboard_ps2_device = {
    NULL
 };

+
 const device_t keyboard_ps2_acer_device = {
    "Acer 90M002A PS/2 Keyboard",
    0,