[pktools] 202/375: Merge branch 'master' of git.sv.gnu.org:/srv/git/pktools

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch upstream-master
in repository pktools.

commit 2cb6ece9416ec65ba9445ffa80c00991dbb855b4
Merge: 11d0102 709bfa5
Author: Pieter Kempeneers <pieter.kempeneers at vito.be>
Date:   Fri Mar 21 18:18:45 2014 +0100

    Merge branch 'master' of git.sv.gnu.org:/srv/git/pktools

 qt/.gitignore            |  1 +
 qt/pkinfo/main.cpp       | 20 ++++++++++++++++++++
 qt/pkinfo/mainwindow.cpp | 19 +++++++++++++++++++
 qt/pkinfo/mainwindow.h   | 20 ++++++++++++++++++++
 4 files changed, 60 insertions(+)

diff --cc qt/pkinfo/mainwindow.cpp
index 2b39832,268bc7c..8bd1b6e
--- a/qt/pkinfo/mainwindow.cpp
+++ b/qt/pkinfo/mainwindow.cpp
@@@ -1,5 -1,25 +1,24 @@@
+ /**********************************************************************
+ mainwindow.cc
+ Copyright (C) 2008-2014 Pieter Kempeneers
+ 
+ This file is part of pktools
+ 
+ pktools 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.
+ 
+ pktools 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 pktools.  If not, see <http://www.gnu.org/licenses/>.
+ ***********************************************************************/
  #include "mainwindow.h"
  #include "ui_mainwindow.h"
 -//#include "MyComboBox.h"
  #include <QFileDialog>
  #include <QMessageBox>
  #include <QDir>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pktools.git