[reactos] 02/02: Merge branch 'master' of https://github.com/reactos/reactos

[jimtabor]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d447b4119877ba3c81e1b…

commit d447b4119877ba3c81e1b3f451c981f7e2adc755
Merge: 5214a38fd0e e329e83857d
Author:     jimtabor <james.tabor(a)reactos.org>
AuthorDate: Mon Dec 9 11:19:18 2019 -0600
Commit:     jimtabor <james.tabor(a)reactos.org>
CommitDate: Mon Dec 9 11:19:18 2019 -0600

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

 modules/rostests/apitests/kernel32/ConsoleCP.c | 10 ++++++----
 win32ss/user/rtl/text.c                        | 14 ++------------
 2 files changed, 8 insertions(+), 16 deletions(-)