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 |
||
|---|---|---|
| .. | ||
| include | ||
| src | ||
| core.pro | ||
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 |
||
|---|---|---|
| .. | ||
| include | ||
| src | ||
| core.pro | ||