ref: 2b6357b106899d01c3d058e9f9cbfe370ca5b6cd
parent: dc22bb700c95d7078fb8ba2c6e225c41ec17ab3e
parent: ff0ef58bdf010b425b5b156b5bd0de0152a07b95
author: Fabian Greffrath <fabian@greffrath.com>
date: Mon Sep 2 17:06:38 EDT 2019
Merge branch 'master' of https://github.com/chocolate-doom/chocolate-doom
--- a/src/i_midipipe.c
+++ b/src/i_midipipe.c
@@ -359,8 +359,6 @@
ok = WritePipe(packet);
NET_FreePacket(packet);
- midi_server_registered = false;
-
ok = ok && BlockForAck();
if (!ok)
{--- a/textscreen/fonts/large.h
+++ b/textscreen/fonts/large.h
@@ -1,4 +1,4 @@
-/* Font data generated from large.bmp; do not edit.
+/* Font data generated from large.png; do not edit.
Please see textscreen/fonts/README for copyright
information. */
--- a/textscreen/fonts/normal.h
+++ b/textscreen/fonts/normal.h
@@ -1,4 +1,4 @@
-/* Font data generated from normal.bmp; do not edit.
+/* Font data generated from normal.png; do not edit.
Please see textscreen/fonts/README for copyright
information. */
--- a/textscreen/fonts/small.h
+++ b/textscreen/fonts/small.h
@@ -1,4 +1,4 @@
-/* Font data generated from small.bmp; do not edit.
+/* Font data generated from small.png; do not edit.
Please see textscreen/fonts/README for copyright
information. */