Merge branch 'item-comments' into develop

Browse Source

Conflicts:
	zaaReloaded2/Formatter/Formatter.cs
	zaaReloaded2/zaaReloaded2.csproj

...

This commit is contained in:

Daniel Kraus

2015-09-04 17:08:13 +02:00

parent 16558cc9a1 adaf75c5fc

commit dccb3145db

30 changed files with 1259 additions and 16 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

www/img/itemcomment.png Executable file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 10 KiB

BIN

www/img/itemcommentresult.png Executable file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 23 KiB

BIN

www/img/itemcommentview.png Executable file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.6 KiB

BIN

www/img/preferences.png Executable file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.8 KiB

BIN

www/img/ribbon.png Normal file → Executable file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.6 KiB After Width:  |  Height:  |  Size: 7.0 KiB