# 
# 
# add_dir "bin"
# 
# add_file "bin/monkey_on_16x16.png"
#  content [fb67346a6e53f66071e806daed640c58671c33fa]
# 
# add_file "monkey_on_16x16.png"
#  content [fb67346a6e53f66071e806daed640c58671c33fa]
# 
# patch "src/model/WorkspaceItem.cpp"
#  from [a9a40a45fed1b8f0751b0bcf3fb38d3ee8a938cb]
#    to [fd2f171c4ed0087abee3dba8eba3c893ab6aba4e]
# 
# patch "src/view/WorkspaceView.cpp"
#  from [fe6bb3821231eb1f55be3bf16f90df99971282e2]
#    to [c845598a3be8c3b345dcc12837e49f6b8d6d9f0a]
# 
#   set "bin/monkey_on_16x16.png"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "monkey_on_16x16.png"
#  attr "mtn:manual_merge"
# value "true"
# 
============================================================
# bin/monkey_on_16x16.png is binary
============================================================
# monkey_on_16x16.png is binary
============================================================
--- src/model/WorkspaceItem.cpp	a9a40a45fed1b8f0751b0bcf3fb38d3ee8a938cb
+++ src/model/WorkspaceItem.cpp	fd2f171c4ed0087abee3dba8eba3c893ab6aba4e
@@ -19,6 +19,8 @@
  ***************************************************************************/
 #include "WorkspaceItem.h"
 
+#include <QIcon>
+
 WorkspaceItem::WorkspaceItem()
 {
     parentItem = this;
@@ -116,27 +118,43 @@
 
 QVariant WorkspaceItem::data(int column, int role) const
 {
-    // we currently only handle the display role
-    // TODO: what to do here for Qt::DecorationRole?
-    if (role != Qt::DisplayRole) return QVariant();
-    
-    // return column headers for root item
-    if (parentItem == this)
-    {
-        switch (column)
-        {
-            case 0: return QVariant(QString(tr("File")));
-            case 1: return QVariant(QString(tr("Status")));
-            default: return QVariant();
-        }
-    }
-    
-    switch (column)
-    {
-        case 0: return QVariant(getFilename());
-        case 1: return QVariant(statusString());
-        default: return QVariant();
-    }  
+	// we currently only handle the display role
+	// TODO: what to do here for Qt::DecorationRole?
+	if(role == Qt::DisplayRole)
+	{
+		// return column headers for root item
+		if (parentItem == this)
+		{
+			switch (column)
+			{
+			case 0: return QVariant(QString(tr("File")));
+			case 1: return QVariant(QString(tr("Status")));
+			default: return QVariant();
+			}
+		}
+
+		switch (column)
+		{
+		case 0: return QVariant(getFilename());
+		case 1: return QVariant(statusString());
+		default: return QVariant();
+		}
+	}
+	else if (role == Qt::DecorationRole) 
+	{
+		if(column == 0)
+		{
+			return QIcon("monkey_on_16x16.png");
+		}
+		else
+		{
+			return QVariant();
+		}
+	}
+	else
+	{
+		return QVariant();
+	}
 }
 
 QList<WorkspaceItem*> WorkspaceItem::getChildren()
============================================================
--- src/view/WorkspaceView.cpp	fe6bb3821231eb1f55be3bf16f90df99971282e2
+++ src/view/WorkspaceView.cpp	c845598a3be8c3b345dcc12837e49f6b8d6d9f0a