Merge branch 'master' into 'overlay_h'

Browse source

# Conflicts:
#   .gitlab-ci.yml
#   dll/steam_client.cpp
#   dll/steam_inventory.h
#   dll/steam_user_stats.h

...

This commit is contained in:

Nemirtingas 2019-12-06 12:44:43 +00:00

parent 33cdf77c77 949a327b8a

commit d1a4adc5bd

37 changed files with 2545 additions and 195 deletions

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

Download patch file Download diff file Expand all files Collapse all files

0

build_steamos.sh Normal file → Executable file

Unescape Escape View file