Mercurial > repos > IBBoard.WarFoundry.GUI.GTK

changeset 103:1bd748721040

find changesets by author, revision, files, or words in the commit message
* 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 diff
     1.1 --- a/FrmMainWindow.cs	Wed Jan 26 20:04:13 2011 +0000
     1.2 +++ b/FrmMainWindow.cs	Sun Feb 13 16:24:55 2011 +0000
     1.3 @@ -3,6 +3,7 @@
     1.4  // 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.
     1.5  
     1.6  using System;
     1.7 +using System.Collections;
     1.8  using System.Collections.Generic;
     1.9  using System.Configuration;
    1.10  using System.IO;
    1.11 @@ -29,7 +30,6 @@
    1.12  using IBBoard.Xml;
    1.13  using log4net;
    1.14  using WFObjects = IBBoard.WarFoundry.API.Objects;
    1.15 -using System.Collections;
    1.16  
    1.17  namespace IBBoard.WarFoundry.GUI.GTK
    1.18  {
    1.19 @@ -1171,11 +1171,11 @@
    1.20  			form.Hide();
    1.21  		}
    1.22  
    1.23 -		public override ICollection<Action> Actions
    1.24 +		public override ICollection<Gtk.Action> Actions
    1.25  		{
    1.26  			get
    1.27  			{
    1.28 -				List<Action> actions = new List<Action>();
    1.29 +				List<Gtk.Action> actions = new List<Gtk.Action>();
    1.30  
    1.31  				foreach (ActionGroup actionGroup in this.UIManager.ActionGroups)
    1.32  				{