Merge tag 'upstream/0.6.0'

Upstream version 0.6.0

1 files changed, 26 insertions, 26 deletions

diff --git a/src/actions/action.vala b/src/actions/action.vala
index ff0e9cd..91fc448 100644
--- a/src/actions/action.vala
+++ b/src/actions/action.vala
@@ -1,23 +1,23 @@
-/* 
-Copyright (c) 2011 by Simon Schneegans
-
-This program is free software: you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the Free
-Software Foundation, either version 3 of the License, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-more details.
-
-You should have received a copy of the GNU General Public License along with
-this program.  If not, see <http://www.gnu.org/licenses/>. 
-*/
+/////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2011-2015 by Simon Schneegans
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or (at
+// your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/////////////////////////////////////////////////////////////////////////
 
 namespace GnomePie {
 
-/////////////////////////////////////////////////////////////////////////    
+/////////////////////////////////////////////////////////////////////////
 /// A base class for actions, which are executed when the user
 /// activates a pie's slice.
 /////////////////////////////////////////////////////////////////////////
@@ -30,33 +30,33 @@ public abstract class Action : GLib.Object {
     /////////////////////////////////////////////////////////////////////
 
     public abstract string real_command { get; construct set; }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// The command displayed to the user. It should be a bit more
     /// beautiful than the real_command.
     /////////////////////////////////////////////////////////////////////
-    
-    public abstract string display_command { get; }  
-    
+
+    public abstract string display_command { get; }
+
     /////////////////////////////////////////////////////////////////////
     /// The name of the Action.
-    /////////////////////////////////////////////////////////////////////  
+    /////////////////////////////////////////////////////////////////////
 
     public virtual string name { get; set; }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// The name of the icon of this Action. It should be in the users
     /// current icon theme.
     /////////////////////////////////////////////////////////////////////
-    
+
     public virtual string icon { get; set; }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// True, if this Action is the quickAction of the associated Pie.
     /// The quickAction of a Pie gets executed when the users clicks on
     /// the center of a Pie.
     /////////////////////////////////////////////////////////////////////
-    
+
     public virtual bool is_quickaction { get; set; }
 
     /////////////////////////////////////////////////////////////////////