Undo last commit, which was an incorrect merge. Still not completely

fixed. svn path=/trunk/KDE/kdeedu/kstars/; revision=1186602
juanep97 · Oct 17, 2010 · 434a98b · 434a98b
1 parent 61fc2b3
commit 434a98b
Show file tree

Hide file tree

Showing 844 changed files with 5,790 additions and 379 deletions.
diff --git a/.krazy b/.krazy
@@ -1 +1,2 @@
-IGNORESUBS tools
+SKIP /kstars/indi/\|/kstars/satlib/\|/kstars/htmesh/
+
diff --git a/AUTHORS b/AUTHORS
@@ -0,0 +1,10 @@
+Jason Harris <jharris@30doradus.org>
+Jasem Mutlaq <mutlaqja@ikarustech.com>
+James Bowlin <bowlin@mindspring.com>
+Pablo de Vicente <pvicentea@wanadoo.es>
+Thomas Kabelmann <tk78@gmx.de>
+Heiko Evermann <heiko.evermann@gmx.de>
+Mark Hollomon <mhh@mindspring.com>
+Carsten Niehaus <cniehaus@gmx.de>
+Vincent Jagot <vincent.jagot@free.fr>
+Martin Piskernig <martin.piskernig@stuwo.at>
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		IGNORESUBS tools
		SKIP /kstars/indi/\\|/kstars/satlib/\\|/kstars/htmesh/