[anjuta] git: Make use of the conflict warning functionality in AnjutaVcsStatusTreeView
- From: James Liggett <jrliggett src gnome org>
- To: svn-commits-list gnome org
- Subject: [anjuta] git: Make use of the conflict warning functionality in AnjutaVcsStatusTreeView
- Date: Wed, 17 Jun 2009 17:09:42 -0400 (EDT)
commit f3397485bd834c43969d1c84c1ec18ca3f14f7d7
Author: James Liggett <jrliggett cox net>
Date: Wed Jun 17 13:54:59 2009 -0700
git: Make use of the conflict warning functionality in AnjutaVcsStatusTreeView
plugins/git/anjuta-git.ui | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/plugins/git/anjuta-git.ui b/plugins/git/anjuta-git.ui
index ebb7eac..e4c725f 100644
--- a/plugins/git/anjuta-git.ui
+++ b/plugins/git/anjuta-git.ui
@@ -254,7 +254,7 @@
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="headers_visible">False</property>
<property name="search_column">0</property>
- <property name="status_codes">ANJUTA_VCS_STATUS_MODIFIED | ANJUTA_VCS_STATUS_ADDED | ANJUTA_VCS_STATUS_DELETED</property>
+ <property name="conflicted_selectable">False</property>
</object>
</child>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]