Compare commits

merge into: sem/Csharp-eindproject:setupBranch

Branches Tags

sem/Csharp-eindproject:master sem/Csharp-eindproject:feature/test/gameCommands sem/Csharp-eindproject:feature/test/testCanvasMessages sem/Csharp-eindproject:feature/test/testUserMessages sem/Csharp-eindproject:setupBranch sem/Csharp-eindproject:feature/guesedWord sem/Csharp-eindproject:hotfix/fixClientServerComms sem/Csharp-eindproject:feature/playerList sem/Csharp-eindproject:stateful-canvas sem/Csharp-eindproject:feature/jsonForWords sem/Csharp-eindproject:feature/disconnect sem/Csharp-eindproject:feature/handleChatData sem/Csharp-eindproject:feature/leaveLobby sem/Csharp-eindproject:feature/sendingCanvasData sem/Csharp-eindproject:feature/broadcastChatMsg sem/Csharp-eindproject:lobbies sem/Csharp-eindproject:feature/addChatBoxToGameWindow

...

pull from: sem/Csharp-eindproject:feature/sendingCanvasData

Branches Tags

sem/Csharp-eindproject:master sem/Csharp-eindproject:feature/test/gameCommands sem/Csharp-eindproject:feature/test/testCanvasMessages sem/Csharp-eindproject:feature/test/testUserMessages sem/Csharp-eindproject:setupBranch sem/Csharp-eindproject:feature/guesedWord sem/Csharp-eindproject:hotfix/fixClientServerComms sem/Csharp-eindproject:feature/playerList sem/Csharp-eindproject:stateful-canvas sem/Csharp-eindproject:feature/jsonForWords sem/Csharp-eindproject:feature/disconnect sem/Csharp-eindproject:feature/handleChatData sem/Csharp-eindproject:feature/leaveLobby sem/Csharp-eindproject:feature/sendingCanvasData sem/Csharp-eindproject:feature/broadcastChatMsg sem/Csharp-eindproject:lobbies sem/Csharp-eindproject:feature/addChatBoxToGameWindow

1 Commits

setupBranch ... feature/sendingCanvasData

Author	SHA1	Message	Date
Lars	35ded2b5ea	Merge branch 'master' into feature/sendingCanvasData	2020-10-21 21:01:58 +02:00

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Expand all files Collapse all files

Diff Content Not Available