summaryrefslogtreecommitdiffstats
path: root/tdeioslave/svn/icons/cr22-action-svn_merge.png
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:05:39 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:05:39 -0600
commitff94d46e423398804d2ae63faeb114c2cf604fc4 (patch)
tree4481ffd491d15ac15081cea46d7cc298ef6351a4 /tdeioslave/svn/icons/cr22-action-svn_merge.png
parentb9553cef2a3cd9f5b89c8aca6f4b7781a079dbb7 (diff)
downloadtdesdk-ff94d46e423398804d2ae63faeb114c2cf604fc4.tar.gz
tdesdk-ff94d46e423398804d2ae63faeb114c2cf604fc4.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'tdeioslave/svn/icons/cr22-action-svn_merge.png')
-rw-r--r--tdeioslave/svn/icons/cr22-action-svn_merge.pngbin0 -> 924 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/tdeioslave/svn/icons/cr22-action-svn_merge.png b/tdeioslave/svn/icons/cr22-action-svn_merge.png
new file mode 100644
index 00000000..08b1a53f
--- /dev/null
+++ b/tdeioslave/svn/icons/cr22-action-svn_merge.png
Binary files differ