Kai S. K. Engelbart
0bbade44a7
Conflicts: src/main/java/envoy/client/net/Client.java src/main/java/envoy/client/net/MessageStatusChangeEventProcessor.java src/main/java/envoy/client/ui/Startup.java src/main/java/envoy/client/ui/controller/ChatScene.java src/main/java/envoy/client/ui/controller/ContactSearchScene.java src/main/java/envoy/client/ui/controller/GroupCreationScene.java src/main/java/envoy/client/ui/controller/LoginScene.java |
||
---|---|---|
.. | ||
Client.java | ||
MessageStatusChangeProcessor.java | ||
ReceivedMessageProcessor.java | ||
Receiver.java | ||
WriteProxy.java | ||
package-info.java |