merge with mainline

1 files changed, 8 insertions, 21 deletions

diff --git a/src/Projection.cxx b/src/Projection.cxx
index 1916d55..02674a7 100644
--- a/src/Projection.cxx
+++ b/src/Projection.cxx
@@ -1,21 +1,8 @@
-// 
-// Copyright 2006 by Johannes Hofmann
 //
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Library General Public
-// License as published by the Free Software Foundation; either
-// version 2 of the License, or (at your option) any later version.
-//
-// This library 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
-// Library General Public License for more details.
-//
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-// USA.
+// Copyright 2006 Johannes Hofmann <Johannes.Hofmann@gmx.de>
 //
+// This software may be used and distributed according to the terms
+// of the GNU General Public License, incorporated herein by reference.
 
 #include <stdio.h>
 #include <math.h>
@@ -23,17 +10,17 @@
 #include "Projection.H"
 
 Projection::Projection() {
-  pi_d = asin(1.0) * 2.0;
+	pi_d = asin(1.0) * 2.0;
 };
 
 void
 Projection::get_coordinates(double a_view, double a_nick,
-		const ViewParams *parms, double *x, double *y) {
-  fprintf(stderr, "Error: Projection::set_coordinates()\n");
+	const ViewParams *parms, double *x, double *y) {
+	fprintf(stderr, "Error: Projection::set_coordinates()\n");
 }
 
 int 
 Projection::comp_params(const Hill *m1, const Hill *m2, ViewParams *parms) {
-  fprintf(stderr, "Error: Projection::comp_params()\n");
-  return 1;
+	fprintf(stderr, "Error: Projection::comp_params()\n");
+	return 1;
 }