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

Browse Source

# Conflicts:
#	runelite-api/src/main/java/net/runelite/api/Varbits.java
#	runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperatureTest.java

...

This commit is contained in:

Zeruth

2019-07-05 00:59:14 -04:00

parent 4045d18b14 d7a1e51041

commit f4b024804e

25 changed files with 317 additions and 131 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

BIN

runelite-client/src/main/resources/net/runelite/client/plugins/customcursor/cursor-dragon-dagger-p.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 973 B