claunia/VARCem
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/devices/input/keyboard_at.c
This commit is contained in:
waltje
2019-04-23 00:43:03 -05:00
parent c4283927a7 d1a18152a3
commit 3a3bed7f96
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/devices/input/keyboard_at.c
View File

@@ -2152,6 +2152,7 @@ const device_t keyboard_ps2_device = {
NULL NULL
}; };
const device_t keyboard_ps2_acer_device = { const device_t keyboard_ps2_acer_device = {
"Acer 90M002A PS/2 Keyboard", "Acer 90M002A PS/2 Keyboard",
0, 0,