comparison src/connectionitem.cpp @ 647:a03264984ef8

Merge
author Chris Cannam
date Mon, 21 Jan 2013 10:22:44 +0000
parents ae67ea0af696
children c0b46d0514a7
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