Maschell
|
c052ed3762
|
Merge branch 'master' of https://github.com/mtheall/ftpd
# Conflicts:
# .gitignore
# 3ds/gfx/gfx.t3s
# Makefile
# README.md
# include/ftpServer.h
# include/ftpSession.h
# include/licenses.h
# source/3ds/imgui_citro3d.cpp
# source/3ds/imgui_citro3d.h
# source/3ds/imgui_ctru.cpp
# source/3ds/imgui_ctru.h
# source/3ds/platform.cpp
# source/3ds/vshader.v.pica
# source/fs.cpp
# source/ftpConfig.cpp
# source/ftpServer.cpp
# source/ftpSession.cpp
# source/licenses.cpp
# source/linux/platform.cpp
# source/log.cpp
# source/main.cpp
# source/mdns.cpp
# source/nds/platform.cpp
# source/posix/collate.c
# source/posix/collate.h
# source/posix/collcmp.c
# source/posix/glob.c
# source/sockAddr.cpp
# source/switch/imgui_deko3d.cpp
# source/switch/imgui_deko3d.h
# source/switch/imgui_fsh.glsl
# source/switch/imgui_nx.cpp
# source/switch/imgui_nx.h
# source/switch/imgui_vsh.glsl
# source/switch/init.c
# source/switch/platform.cpp
|
2025-08-28 18:20:10 +02:00 |
|