Major redesign of the build system. Also allow icons to be installed optionally:

[quassel.git] / icons / oxygen / 22x22 / actions / svn_merge.png

diff --git a/icons/oxygen/22x22/actions/svn_merge.png b/icons/oxygen/22x22/actions/svn_merge.png
new file mode 100644 (file)
index 0000000..aaff786
Binary files /dev/null and b/icons/oxygen/22x22/actions/svn_merge.png differ