# Merge status #

- **DONE** / merge: src/main.cpp

- **DONE** / merge: lib/config/fnConfig.h lib/config/fnConfig.cpp

- **DONE** / identical: lib/config/fnc_bt.cpp

- **DONE** / identical: lib/config/fnc_cassette.cpp

- **DONE** / identical: lib/config/fnc_cpm.cpp

- **DONE** / identical: lib/config/fnc_enable.cpp

- **DONE**: lib/config/fnc_general.cpp

- **DONE** / identical: lib/config/fnc_hosts.cpp

- **DONE**: lib/config/fnc_load.cpp

- **DONE** / identical: lib/config/fnc_modem.cpp

- **DONE** / identical: lib/config/fnc_mounts.cpp

- **DONE** / merge: lib/config/fnc_network.cpp

- **DONE** / identical: lib/config/fnc_phonebook.cpp

- **DONE** / identical: lib/config/fnc_printer.cpp

- **DONE** / merge: lib/config/fnc_save.cpp

- **DONE** / merge: lib/config/fnc_serial.cpp

- **DONE** / merge: lib/config/fnc_util.cpp

- **DONE** / identical: lib/config/fnc_wifi.cpp

- **DONE** / merge: include/debug.h

- **DONE** / merge: lib/utils/utils.h lib/utils/utils.cpp

- **DONE** / identical: lib/utils/cbuf.h lib/utils/cbuf.cpp

- **DONE**: lib/utils/string_utils.h lib/utils/string_utils.cpp

- **DONE** / add: lib/hardware/fnWiFi.h lib/hardware/fnDummyWiFi.h lib/hardware/fnDummyWiFi.cpp

- **DONE** / merge: lib/hardware/led.h lib/hardware/led.cpp

- **DONE** / merge: lib/hardware/fnUART.h lib/hardware/fnUART.cpp lib/hardware/fnUARTUnix.cpp lib/hardware/fnUARTWindows.cpp

- **DONE** / merge: lib/hardware/fnSystem.h lib/hardware/fnSystem.cpp lib/hardware/fnSystemNet.cpp

- **DONE** / add: lib/FileSystem/fnDirCache.h lib/FileSystem/fnDirCache.cpp

- **DONE** / merge: lib/FileSystem/fnFS.h lib/FileSystem/fnFS.cpp

- **DONE** / merge: lib/FileSystem/fnFsSPIFFS.h lib/FileSystem/fnFsSPIFFS.cpp

- **DONE** / merge: lib/FileSystem/fnFsSD.h lib/FileSystem/fnFsSD.cpp

- **DONE** / merge: lib/FileSystem/fnFsTNFS.h lib/FileSystem/fnFsTNFS.cpp

- **DONE** / add: lib/FileSystem/fnFsSMB.h lib/FileSystem/fnFsSMB.cpp

- **DONE** / add: lib/FileSystem/fnFsFTP.h lib/FileSystem/fnFsFTP.cpp

- **DONE** / add: lib/FileSystem/fnFile.h lib/FileSystem/fnFile.cpp

- **DONE** / add: lib/FileSystem/fnFileLocal.h lib/FileSystem/fnFileLocal.cpp

- **DONE** / add: lib/FileSystem/fnFileTNFS.h lib/FileSystem/fnFileTNFS.cpp

- **DONE** / add: lib/FileSystem/fnFileSMB.h lib/FileSystem/fnFileSMB.cpp

- **DONE** / add: lib/FileSystem/fnFileMem.h lib/FileSystem/fnFileMem.cpp

- **DONE** / identical: lib/EdUrlParser/EdUrlParser.h lib/EdUrlParser/EdUrlParser.cpp

- **DONE** / merge: lib/tcpip/fnDNS.h lib/tcpip/fnDNS.cpp

- **DONE** / merge: lib/tcpip/fnUDP.h lib/tcpip/fnUDP.cpp

- **DONE** / merge: lib/tcpip/fnTcpClient.h lib/tcpip/fnTcpClient.cpp

- **DONE** / merge: lib/tcpip/fnTcpServer.h lib/tcpip/fnTcpServer.cpp

- **DONE** / merge: lib/ftp/fnFTP.h lib/ftp/fnFTP.cpp

- **DONE** / merge: lib/TNFSlib/tnfslibMountInfo.h lib/TNFSlib/tnfslibMountInfo.cpp

- **DONE** / merge: lib/TNFSlib/tnfslib.h lib/TNFSlib/tnfslib.cpp

- **DONE** / identical: lib/telnet/libtelnet.h lib/telnet/libtelnet.c

- **DONE** / merge: lib/fnjson/fnjson.h lib/fnjson/fnjson.cpp

- **DONE** / add: components_pc/mongoose/mongoose.h components_pc/mongoose/mongoose.c

- **DONE** / identical: lib/webdav/WebDAV.h lib/webdav/WebDAV.cpp

- **DONE** / merrge: lib/http/httpService.h lib/http/httpService.cpp

    added lib/http/mgHttpService.cpp - mongoose based version for fujinet-pc

- **DONE** / merge: lib/http/httpServiceParser.h lib/http/httpServiceParser.cpp

- **DONE** / merge: lib/http/httpServiceConfigurator.h lib/http/httpServiceConfigurator.cpp

- **DONE** / add: lib/http/httpServiceBrowser.h lib/http/httpServiceBrowser.cpp

- **DONE** / add: lib/http/mgHttpClient.h lib/http/mgHttpClient.cpp

- **DONE** / add: lib/task/fnTask.h lib/task/fnTask.cpp

- **DONE** / add: lib/task/fnTaskManager.h lib/task/fnTaskManager.cpp

- **DONE** / identical: lib/printer-emulator/atari_1020.h lib/printer-emulator/atari_1020.cpp

- **DONE** / identical: lib/printer-emulator/atari_1025.h lib/printer-emulator/atari_1025.cpp

- **DONE** / merge: lib/printer-emulator/atari_1027.h lib/printer-emulator/atari_1027.cpp

- **DONE** / identical: lib/printer-emulator/atari_1029.h lib/printer-emulator/atari_1029.cpp

- **DONE** / identical: lib/printer-emulator/atari_820.h lib/printer-emulator/atari_820.cpp

- **DONE** / identical: lib/printer-emulator/atari_822.h lib/printer-emulator/atari_822.cpp

- **DONE** / identical: lib/printer-emulator/atari_825.h lib/printer-emulator/atari_825.cpp

- **DONE** / identical: lib/printer-emulator/atari_xdm121.h lib/printer-emulator/atari_xdm121.cpp

- **DONE** / identical: lib/printer-emulator/atari_xmm801.h lib/printer-emulator/atari_xmm801.cpp

- **DONE** / merge: lib/printer-emulator/epson_80.h lib/printer-emulator/epson_80.cpp

- **DONE** / identical: lib/printer-emulator/epson_tps.h

- **DONE** / merge: lib/printer-emulator/file_printer.h lib/printer-emulator/file_printer.cpp

- **DONE** / merge: lib/printer-emulator/html_printer.h lib/printer-emulator/html_printer.cpp

- **DONE** / identical: lib/printer-emulator/okimate_10.h lib/printer-emulator/okimate_10.cpp

- **DONE** / merge: lib/printer-emulator/pdf_printer.h lib/printer-emulator/pdf_printer.cpp

- **DONE** / merge: lib/printer-emulator/png_printer.h lib/printer-emulator/png_printer.cpp

- **DONE** / merge: lib/printer-emulator/printer_emulator.h lib/printer-emulator/printer_emulator.cpp

- **DONE** / identical: lib/printer-emulator/svg_plotter.h lib/printer-emulator/svg_plotter.cpp

- **DONE** / identical: lib/network-protocol/networkStatus.h lib/network-protocol/status_error_codes.h

- **DONE** / merge: lib/network-protocol/Protocol.h lib/network-protocol/Protocol.cpp

- **DONE** / merge: lib/network-protocol/ProtocolParser.h lib/network-protocol/ProtocolParser.cpp

- **DONE** / merge: lib/network-protocol/Test.h lib/network-protocol/Test.cpp

- **DONE** / merge: lib/network-protocol/TCP.h lib/network-protocol/TCP.cpp

- **DONE** / merge: lib/network-protocol/UDP.h lib/network-protocol/UDP.cpp

- **DONE** / merge: lib/network-protocol/Telnet.h lib/network-protocol/Telnet.cpp

- **DONE** / merge: lib/network-protocol/FS.h lib/network-protocol/FS.cpp

- **DONE** / identical: lib/network-protocol/FTP.h lib/network-protocol/FTP.cpp

- **DONE** / merge: lib/network-protocol/TNFS.h lib/network-protocol/TNFS.cpp

- **DONE** / merge: lib/network-protocol/HTTP.h lib/network-protocol/HTTP.cpp

- **DONE** / merge: lib/network-protocol/SMB.h lib/network-protocol/SMB.cpp

- **DONE** / merge: lib/network-protocol/SSH.h lib/network-protocol/SSH.cpp

- **DONE** / identical: lib/fuji/fujiCmd.h

- **DONE** / merge: lib/fuji/fujiHost.h lib/fuji/fujiHost.cpp

- **DONE** / merge: lib/fuji/fujiDisk.h lib/fuji/fujiDisk.cpp

- **DONE** / merge: lib/bus/bus.h

- **DONE** / merge: lib/bus/iwm/iwm.h lib/bus/iwm/iwm.cpp

- **DONE** / merge: lib/bus/iwm/iwm_slip.h lib/bus/iwm/iwm_slip.cpp

- **DONE** / merge: lib/bus/iwm/iwm_slip.h lib/bus/iwm/iwm_slip.cpp

- **DONE**: lib/bus/sio/sio.h lib/bus/sio/sio.cpp

- **DONE** / add: lib/bus/sio/siocom/sioport.h lib/bus/sio/siocom/sioport.cpp

- **DONE** / add: lib/bus/sio/siocom/serialsio.h lib/bus/sio/siocom/serialsio.cpp

- **DONE** / add: lib/bus/sio/siocom/netsio.h lib/bus/sio/siocom/netsio.cpp

- **DONE** / add: lib/bus/sio/siocom/fnSioCom.h lib/bus/sio/siocom/fnSioCom.cpp

- **DONE** / merge: lib/device/device.h

- **DONE** / merge: lib/device/disk.h

- **DONE** / identical: lib/device/printer.h

- **DONE** / identical: lib/device/modem.h

- **DONE** / identical: lib/device/cassette.h

- **DONE** / identical: lib/device/fuji.h

- **DONE** / identical: lib/device/network.h

- **DONE** / identical: lib/device/udpstream.h

- **DONE** / identical: lib/device/siocpm.h

- **DONE** / merge: lib/device/iwm/disk.h lib/device/iwm/disk.cpp

- **DONE** / merge: lib/device/iwm/disk2.h lib/device/iwm/disk2.cpp

- **DONE** / merge: lib/device/iwm/printer.h lib/device/iwm/printer.cpp

- **DONE** / merge: lib/device/iwm/printerlist.h lib/device/iwm/printerlist.cpp

- **DONE** / merge: lib/device/iwm/modem.h lib/device/iwm/modem.cpp

- **DONE** / merge: lib/device/iwm/fuji.h lib/device/iwm/fuji.cpp

- **DONE** / merge: lib/device/iwm/network.h lib/device/iwm/network.cpp

- **DONE** / merge: lib/device/iwm/clock.h lib/device/iwm/clock.cpp

- **DONE** / merge: lib/device/iwm/cpm.h lib/device/iwm/cpm.cpp

- **DONE** / merge: lib/device/sio/disk.h lib/device/sio/disk.cpp

- **DONE** / merge: lib/device/sio/printer.h lib/device/sio/printer.cpp

- **DONE** / identical: lib/device/sio/printerlist.h lib/device/sio/printerlist.cpp

- **DONE** / merge: lib/device/sio/cassette.h lib/device/sio/cassette.cpp

- **DONE** / merge: lib/device/sio/fuji.h lib/device/sio/fuji.cpp

- **DONE** / merge: lib/device/sio/network.h lib/device/sio/network.cpp

- **DONE** / merge: lib/device/sio/udpstream.h lib/device/sio/udpstream.cpp

- **DONE** / merge: lib/device/sio/voice.h lib/device/sio/voice.cpp

- **DONE** / merge: lib/device/sio/apetime.h lib/device/sio/apetime.cpp

- **DONE** / merge: lib/device/sio/siocpm.h lib/device/sio/siocpm.cpp

- **DONE** / add: lib/device/sio/pclink.h lib/device/sio/pclink.cpp

- **DONE** / merge: lib/modem/modem.h lib/modem/modem.cpp

- **DONE** / merge: lib/modem-sniffer/modem-sniffer.h lib/modem-sniffer/modem-sniffer.cpp

- **DONE** / merge: lib/media/media.h

- **DONE** / merge: lib/media/apple/mediaType.h lib/media/apple/mediaType.cpp

- **DONE** / merge: lib/media/apple/mediaTypeDO.h lib/media/apple/mediaTypeDO.cpp

- **DONE** / merge: lib/media/apple/mediaTypeDSK.h lib/media/apple/mediaTypeDSK.cpp

- **DONE** / merge: lib/media/apple/mediaTypePO.h lib/media/apple/mediaTypePO.cpp

- **DONE** / merge: lib/media/apple/mediaTypeWOZ.h lib/media/apple/mediaTypeWOZ.cpp

- **DONE** / merge: lib/media/atari/diskType.h lib/media/atari/diskType.cpp

- **DONE** / merge: lib/media/atari/diskTypeAtr.h lib/media/atari/diskTypeAtr.cpp

- **DONE** / merge: lib/media/atari/diskTypeAtx.h

- **DONE** / merge: lib/media/atari/diskTypeXex.h lib/media/atari/diskTypeXex.cpp

- **DONE** / identical: lib/base64/base64.h lib/base64/base64.c

- **DONE** / identical: lib/encrypt/crypt.h lib/encrypt/crypt.cpp

- **DONE** / merge: lib/runcpm

- **DONE** / merge: lib/compat/compat_inet.c

- **DONE** / add: lib/compat/compat_gettimeofday.h lib/compat/compat_gettimeofday.c

- **DONE** / add: lib/compat/win32_uname.c

- **DONE** / add: lib/compat/strlcat.c lib/compat/strlcpy.c
