projects / vuplus_xbmc / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 85d83ae 9397281)
Merge pull request #7214 from uNiversaI/icons2
authorronie <ronie@poedel.net>
Tue, 18 Aug 2015 18:30:43 +0000 (20:30 +0200)
committerronie <ronie@poedel.net>
Tue, 18 Aug 2015 18:30:43 +0000 (20:30 +0200)
[confluence] uppercase icon name and allow separate icons

1  2 
xbmc/Util.cpp patch | diff1 | diff2 | blob | history
xbmc/filesystem/SourcesDirectory.cpp patch | diff1 | diff2 | blob | history

diff --cc xbmc/Util.cpp
Simple merge
diff --cc xbmc/filesystem/SourcesDirectory.cpp
Simple merge
Unnamed repository; edit this file 'description' to name the repository.