Merge remote-tracking branch 'origin/master' into MSAA

Browse Source

Conflicts:
	resources/Schema/Entities/CP_Rocky2.xml

...

This commit is contained in:

Teejoon

2016-03-13 21:28:38 +01:00

parent 5796d07b56 c790b952fb

commit f59a9e1d2b

11 changed files with 11116 additions and 8906 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

resources/Schema/Entities/CP_Rocky2.xml

+8404 -8404

File diff suppressed because it is too large Load Diff

resources/Schema/Entities/OverwatchCamera.xml

+2633 -294

File diff suppressed because it is too large Load Diff