Services

Browse Source

Merge branch 'accounts'

Conflicts:
	resources.qrc
	src/accounts/zeroconf/zeroconf.cpp

...

This commit is contained in:

Leo Franchi

2012-03-07 18:23:32 -05:00

parent 935b046acc 2878552239

commit 0067e376ae

131 changed files with 7541 additions and 4348 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/images/lastfm-icon.png Normal file

Binary file not shown.

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