Skip to content

Merge upstream PRs #120, #121, and #123#4

Merged
GT-610 merged 11 commits into
mainfrom
upstream-prs-120-121-123
May 10, 2026
Merged

Merge upstream PRs #120, #121, and #123#4
GT-610 merged 11 commits into
mainfrom
upstream-prs-120-121-123

Conversation

@GT-610

@GT-610 GT-610 commented May 10, 2026

Copy link
Copy Markdown
Owner

This PR brings in the three currently useful upstream PRs from mikkokko/csgo_gc into this fork's main branch.


Open in Devin Review

dricotec and others added 10 commits April 29, 2026 09:16
Added trade-up completion chat broadcast.
Fix build errors.
# Conflicts:
#	README.md
#	csgo_gc/gc_client.cpp
#	csgo_gc/gc_client.h
#	csgo_gc/inventory.cpp
#	csgo_gc/inventory.h
# Conflicts:
#	README.md
#	csgo_gc/inventory.h

@devin-ai-integration devin-ai-integration Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Devin Review found 2 potential issues.

View 5 additional findings in Devin Review.

Open in Devin Review

Comment thread csgo_gc/inventory.cpp Outdated
Comment thread csgo_gc/inventory.cpp Outdated
@GT-610
GT-610 merged commit a0725fb into main May 10, 2026
4 checks passed
@GT-610
GT-610 deleted the upstream-prs-120-121-123 branch May 10, 2026 03:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants