akashi-esquizolandia/core
Cerapter ba3d20186d Merge remote-tracking branch 'refs/remotes/scatter/master'
Conflicts:
	akashi.pro
	core/src/aoclient.cpp
	core/src/commands/authentication.cpp
	core/src/packets.cpp
	src/aoclient.cpp
	src/commands/authentication.cpp
	src/packets.cpp
2021-05-09 15:11:02 +02:00
..
include Merge remote-tracking branch 'refs/remotes/scatter/master' 2021-05-09 15:11:02 +02:00
src Merge remote-tracking branch 'refs/remotes/scatter/master' 2021-05-09 15:11:02 +02:00
core.pro Forbid Windows builds from making subdirs in destdir 2021-05-04 08:40:46 +02:00