Merge branch 'master' of https://bitbucket.org/Regalis11/subsurface-private

Browse Source

Conflicts:
	Subsurface/Source/Characters/AI/Objectives/AIObjectiveManager.cs

...

This commit is contained in:

Regalis

2016-01-18 21:48:40 +02:00

parent 1a5b3fa66a 19ec05c70e

commit 9405df006a

7 changed files with 87 additions and 9 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

Subsurface/Content/UI/orderSymbols.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.7 KiB After Width:  |  Height:  |  Size: 8.9 KiB