Fixed merged conflicts from menu branch

Browse Source

...

This commit is contained in:

Maran

2012-07-31 18:20:54 +02:00

parent 7682f00fb5 fa97acc2b4

commit 7dbad12743

5 changed files with 18 additions and 42 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

data/icons/accounts.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 921 B

BIN

data/icons/expand.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 657 B

BIN

data/icons/interact.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 968 B