From 0b05b71ae50aed5c081df08eb98170b36b7c1ba6 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Tue, 6 Dec 2011 20:49:14 +0100 Subject: [PATCH] added GPL header Signed-off-by: Sven Strickroth --- src/TortoiseProc/DeleteConflictDlg.cpp | 18 ++++++++++++++++++ src/TortoiseProc/DeleteConflictDlg.h | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/src/TortoiseProc/DeleteConflictDlg.cpp b/src/TortoiseProc/DeleteConflictDlg.cpp index 589e6bd07..e7210cd01 100644 --- a/src/TortoiseProc/DeleteConflictDlg.cpp +++ b/src/TortoiseProc/DeleteConflictDlg.cpp @@ -1,3 +1,21 @@ +// TortoiseGit - a Windows shell extension for easy version control + +// Copyright (C) 2009-2011 - TortoiseGit + +// 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 2 +// 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, write to the Free Software Foundation, +// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +// // DeleteConflictDlg.cpp : implementation file // diff --git a/src/TortoiseProc/DeleteConflictDlg.h b/src/TortoiseProc/DeleteConflictDlg.h index 95de71621..247ed44ea 100644 --- a/src/TortoiseProc/DeleteConflictDlg.h +++ b/src/TortoiseProc/DeleteConflictDlg.h @@ -1,3 +1,21 @@ +// TortoiseGit - a Windows shell extension for easy version control + +// Copyright (C) 2009-2011 - TortoiseGit + +// 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 2 +// 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, write to the Free Software Foundation, +// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +// #pragma once #include "StandAloneDlg.h" -- 2.11.4.GIT