Mercurial > repos > IBDev-IBBoard.WarFoundry.GUI.GTK

changeset 103:1bd748721040

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Resolve conflict of System.Action vs Gtk.Action no-open-ticket
author IBBoard <dev@ibboard.co.uk>
date Sun, 13 Feb 2011 16:24:55 +0000
parents 5d94889b1509
children 0e76b94420b5
files FrmMainWindow.cs
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/FrmMainWindow.cs	Wed Jan 26 20:04:13 2011 +0000
+++ b/FrmMainWindow.cs	Sun Feb 13 16:24:55 2011 +0000
@@ -3,6 +3,7 @@
 // The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Configuration;
 using System.IO;
@@ -29,7 +30,6 @@
 using IBBoard.Xml;
 using log4net;
 using WFObjects = IBBoard.WarFoundry.API.Objects;
-using System.Collections;
 
 namespace IBBoard.WarFoundry.GUI.GTK
 {
@@ -1171,11 +1171,11 @@
 			form.Hide();
 		}
 
-		public override ICollection<Action> Actions
+		public override ICollection<Gtk.Action> Actions
 		{
 			get
 			{
-				List<Action> actions = new List<Action>();
+				List<Gtk.Action> actions = new List<Gtk.Action>();
 
 				foreach (ActionGroup actionGroup in this.UIManager.ActionGroups)
 				{