comparison src/mainwindow.cpp @ 647:a03264984ef8

Merge
author Chris Cannam
date Mon, 21 Jan 2013 10:22:44 +0000
parents e2f6bb97cc22 ae67ea0af696
children b55466f7b8bf
comparison
equal deleted inserted replaced
646:6653fc50a546 647:a03264984ef8
3 /* 3 /*
4 EasyMercurial 4 EasyMercurial
5 5
6 Based on hgExplorer by Jari Korhonen 6 Based on hgExplorer by Jari Korhonen
7 Copyright (c) 2010 Jari Korhonen 7 Copyright (c) 2010 Jari Korhonen
8 Copyright (c) 2012 Chris Cannam 8 Copyright (c) 2013 Chris Cannam
9 Copyright (c) 2012 Queen Mary, University of London 9 Copyright (c) 2013 Queen Mary, University of London
10 10
11 This program is free software; you can redistribute it and/or 11 This program is free software; you can redistribute it and/or
12 modify it under the terms of the GNU General Public License as 12 modify it under the terms of the GNU General Public License as
13 published by the Free Software Foundation; either version 2 of the 13 published by the Free Software Foundation; either version 2 of the
14 License, or (at your option) any later version. See the file 14 License, or (at your option) any later version. See the file
191 "SoundSoftware.ac.uk at the Centre for Digital Music, " 191 "SoundSoftware.ac.uk at the Centre for Digital Music, "
192 "Queen Mary, University of London.</p>" 192 "Queen Mary, University of London.</p>"
193 "<p>EasyMercurial is based on HgExplorer by " 193 "<p>EasyMercurial is based on HgExplorer by "
194 "Jari Korhonen, with thanks.</p>" 194 "Jari Korhonen, with thanks.</p>"
195 "<p style=\"margin-left: 2em;\">" 195 "<p style=\"margin-left: 2em;\">"
196 "Copyright &copy; 2012 Queen Mary, University of London.<br>" 196 "Copyright &copy; 2013 Queen Mary, University of London.<br>"
197 "Copyright &copy; 2010 Jari Korhonen.<br>" 197 "Copyright &copy; 2010 Jari Korhonen.<br>"
198 "Copyright &copy; 2012 Chris Cannam." 198 "Copyright &copy; 2013 Chris Cannam."
199 "</p>" 199 "</p>"
200 "<p style=\"margin-left: 2em;\">" 200 "<p style=\"margin-left: 2em;\">"
201 "This program requires Mercurial, by Matt Mackall and others.<br>" 201 "This program requires Mercurial, by Matt Mackall and others.<br>"
202 "This program uses Qt by Nokia.<br>" 202 "This program uses Qt by Nokia.<br>"
203 "This program uses Nuvola icons by David Vignoni.<br>" 203 "This program uses Nuvola icons by David Vignoni.<br>"