Merge 1.x into master #2

Merged
sikofitt merged 18 commits from 1.x into master 2022-05-17 11:15:18 -07:00
2 changed files with 6 additions and 2 deletions
Showing only changes of commit 76d81d5d0b - Show all commits

View File

@ -2,6 +2,7 @@
"name": "olivebbs/getch", "name": "olivebbs/getch",
"description": "Implements _getch and _ungetch for windows and linux using ffi", "description": "Implements _getch and _ungetch for windows and linux using ffi",
"type": "library", "type": "library",
"keywords": ["getch", "windows", "conio", "linux", "console", "conio.h", "hotkey", "termios"],
"require": { "require": {
"php": ">=7.4", "php": ">=7.4",
"ext-ffi": "*" "ext-ffi": "*"
@ -29,5 +30,8 @@
"name": "R. Eric Wheeler", "name": "R. Eric Wheeler",
"email": "sikofitt@gmail.com" "email": "sikofitt@gmail.com"
} }
] ],
"conflict": {
"sikofitt/getch": "*"
}
} }

2
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "a9f24f3e6bdfb946f6671416016d7e76", "content-hash": "4d1f166ee2e71f29c8f3567cba3ee2e6",
"packages": [], "packages": [],
"packages-dev": [ "packages-dev": [
{ {