Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sta/websocket-sharp
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: katsuhirogg/websocket-sharp
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 6 commits
  • 15 files changed
  • 1 contributor

Commits on Feb 2, 2021

  1. Ported to NET Core

    @darknessxk
    darknessxk committed Feb 2, 2021
    Configuration menu
    Copy the full SHA
    4d81f2f View commit details
    Browse the repository at this point in the history

  2. Updated Readme

    @darknessxk
    darknessxk committed Feb 2, 2021
    Configuration menu
    Copy the full SHA
    7652ba7 View commit details
    Browse the repository at this point in the history

  3. Added proper async Tasks instead of using unsupported .NET Core Begin… 

    …Invoke/EndInvoke
    @darknessxk
    darknessxk committed Feb 2, 2021
    Configuration menu
    Copy the full SHA
    87ee6d0 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2021

  1. Merge remote-tracking branch 'upstream/master' into master

    @darknessxk
    darknessxk committed Feb 11, 2021
    Configuration menu
    Copy the full SHA
    8c98a17 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2022

  1. Conflicts resolving for merging remote sta branch to katlab branch 

    # Conflicts:
#	Example/Example.csproj
#	Example/Program.cs
#	Example2/Chat.cs
#	Example2/Echo.cs
#	Example2/Program.cs
#	Example3/Chat.cs
#	Example3/Echo.cs
#	Example3/Program.cs
#	websocket-sharp.sln
#	websocket-sharp/Net/HttpStreamAsyncResult.cs
#	websocket-sharp/WebSocket.cs
    @darknessxk
    darknessxk committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    4996732 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from katsuhirogg/pulls/1335341197/1 

    Pulls/1335341197/1
    @darknessxk
    darknessxk authored Jul 12, 2022
    Configuration menu
    Copy the full SHA
    c509e2a View commit details
    Browse the repository at this point in the history
Loading