Mercurial > hg > easyhg
diff src/squeezedlabel.cpp @ 583:e40e3ebe9f2e fswatcher
Merge from default branch
author | Chris Cannam |
---|---|
date | Mon, 12 Mar 2012 14:58:40 +0000 |
parents | 533519ebc0cb |
children | ae67ea0af696 |
line wrap: on
line diff
--- a/src/squeezedlabel.cpp Tue Feb 14 17:53:29 2012 +0000 +++ b/src/squeezedlabel.cpp Mon Mar 12 14:58:40 2012 +0000 @@ -5,8 +5,8 @@ Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen - Copyright (c) 2011 Chris Cannam - Copyright (c) 2011 Queen Mary, University of London + Copyright (c) 2012 Chris Cannam + Copyright (c) 2012 Queen Mary, University of London This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -17,7 +17,7 @@ /* This file adapted from Rosegarden, a sequencer and musical - notation editor. Copyright 2000-2011 the Rosegarden development + notation editor. Copyright 2000-2012 the Rosegarden development team. Adapted from KDE 4.2.0, this code originally Copyright (c) 2000