Merge branch 'new_spawn' into devel
Conflicts: todo.txt web/news.txt web/nimrod.ini
This commit is contained in:
commit
6d3b632b47
39 changed files with 8083 additions and 7242 deletions
|
|
@ -41,6 +41,7 @@ when defined(windows):
|
|||
|
||||
const
|
||||
winEncodings = [
|
||||
(1, "OEMCP"), # current OEM codepage
|
||||
(037, "IBM037"), # IBM EBCDIC US-Canada
|
||||
(437, "IBM437"), # OEM United States
|
||||
(500, "IBM500"), # IBM EBCDIC International
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue