Merge branch 'quality-definitions' into develop

Browse Source

Conflicts:
	src/UI/Settings/Quality/Profile/EditQualityProfileTemplate.html
	src/UI/app.js

...

This commit is contained in:

Mark McDowall

2014-02-03 17:29:22 -08:00

parent 9a43ab9b94 45304b1bbc

commit 958c2f1fe1

120 changed files with 7114 additions and 1218 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

src/UI/JsLibraries/backbone.collectionview.js

+1072

File diff suppressed because it is too large Load Diff

src/UI/JsLibraries/jquery-ui.js

Vendored

+4233

File diff suppressed because it is too large Load Diff