Merge pull request #65 from dstndstn/radix

relicensing
dstndstn · Sep 13, 2015 · 15c0399 · 15c0399
2 parents c3ce036 + ade509b
commit 15c0399
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 67 deletions.
diff --git a/README.md b/README.md
@@ -22,9 +22,9 @@ Latest release: http://astrometry.net/downloads/astrometry.net-latest.tar.gz
 Copyright 2006-2015 Michael Blanton, David W. Hogg, Dustin Lang, Keir
 Mierle and Sam Roweis (the Astrometry.net Team).
 
-Contributions from Sjoert van Velzen, Themos Tsikas (wcs-match.c),
-Andrew Hood, Thomas Stibor, Denis Vida, Ole Streicher, David
-Warde-Farley, Jon Barron, and others.
+Contributions from Sjoert van Velzen, Themos Tsikas, Andrew Hood,
+Thomas Stibor, Denis Vida, Ole Streicher, David Warde-Farley, Jon
+Barron, Christopher Stumm, Michal Kočer (Klet Observatory) and others.
 
 Parts of the code written by the Astrometry.net Team are licensed
 under a 3-clause BSD-style license.  See the file LICENSE for the full

diff --git a/blind/spike_join.c b/blind/spike_join.c
@@ -1,19 +1,6 @@
 /*
-  This file is part of the Astrometry.net suite.
-  Copyright 2007, Christopher Stumm.
-
-  The Astrometry.net suite 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, version 2.
-
-  The Astrometry.net suite 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 the Astrometry.net suite ; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+# This file is part of the Astrometry.net suite.
+# Licensed under a 3-clause BSD style license - see LICENSE
 */
 
 /*-------------------------------------------------------------

diff --git a/catalogs/ucac4.c b/catalogs/ucac4.c
@@ -1,20 +1,6 @@
 /*
-  This file is part of the Astrometry.net suite.
-  Copyright 2011 Dustin Lang.
-  Copyright 2013 Michal Kočer, Klet Observatory.
-
-  The Astrometry.net suite 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, version 2.
-
-  The Astrometry.net suite 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 the Astrometry.net suite ; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+# This file is part of the Astrometry.net suite.
+# Licensed under a 3-clause BSD style license - see LICENSE
 */
 
 #include <stdint.h>

diff --git a/catalogs/ucac4tofits.c b/catalogs/ucac4tofits.c
@@ -1,20 +1,6 @@
 /*
-  This file is part of the Astrometry.net suite.
-  Copyright 2011 Dustin Lang.
-  Copyright 2013 Michal Kočer, Klet Observatory.
-
-  The Astrometry.net suite 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, version 2.
-
-  The Astrometry.net suite 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 the Astrometry.net suite ; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+# This file is part of the Astrometry.net suite.
+# Licensed under a 3-clause BSD style license - see LICENSE
 */
 
 #include <stdio.h>

diff --git a/include/astrometry/permutedsort.h b/include/astrometry/permutedsort.h
@@ -6,7 +6,7 @@
 #ifndef PERMUTED_SORT_H
 #define PERMUTED_SORT_H
 
-// for QSORT_COMPARISON_FUNCTIOn
+// for QSORT_COMPARISON_FUNCTION
 #include "os-features.h"
 
 /*

diff --git a/include/astrometry/ucac4.h b/include/astrometry/ucac4.h
@@ -1,20 +1,6 @@
 /*
-  This file is part of the Astrometry.net suite.
-  Copyright 2011 Dustin Lang.
-  Copyright 2013 Michal Kočer, Klet Observatory.
-
-  The Astrometry.net suite 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, version 2.
-
-  The Astrometry.net suite 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 the Astrometry.net suite ; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+# This file is part of the Astrometry.net suite.
+# Licensed under a 3-clause BSD style license - see LICENSE
 */
 
 #ifndef UCAC4_H