Merge branch 'unstable' into trackhat-ui

6 files changed, 50 insertions, 1 deletions

diff --git a/facetracknoir/curve-config.cpp b/facetracknoir/curve-config.cpp
index f6c78f79..e199d005 100644
--- a/facetracknoir/curve-config.cpp
+++ b/facetracknoir/curve-config.cpp
@@ -1,4 +1,12 @@
-#include "./curve-config.h"
+/* Copyright (c) 2014-2015, Stanislaw Halik <sthalik@misaki.pl>
+
+ * Permission to use, copy, modify, and/or distribute this
+ * software for any purpose with or without fee is hereby granted,
+ * provided that the above copyright notice and this permission
+ * notice appear in all copies.
+ */
+
+#include "curve-config.h"
 #include "opentrack/main-settings.hpp"
 MapWidget::MapWidget(Mappings& m, main_settings& s) :
     m(m)
diff --git a/facetracknoir/options-dialog.cpp b/facetracknoir/options-dialog.cpp
index 1b64de9e..10fbbed6 100644
--- a/facetracknoir/options-dialog.cpp
+++ b/facetracknoir/options-dialog.cpp
@@ -1,3 +1,11 @@
+/* Copyright (c) 2015, Stanislaw Halik <sthalik@misaki.pl>
+
+ * Permission to use, copy, modify, and/or distribute this
+ * software for any purpose with or without fee is hereby granted,
+ * provided that the above copyright notice and this permission
+ * notice appear in all copies.
+ */
+
 #include "options-dialog.hpp"
 #include "ftnoir_tracker_pt/camera.h"
 
diff --git a/facetracknoir/process_detector.cpp b/facetracknoir/process_detector.cpp
index 8efc0c10..df38eb29 100644
--- a/facetracknoir/process_detector.cpp
+++ b/facetracknoir/process_detector.cpp
@@ -1,3 +1,11 @@
+/* Copyright (c) 2015, Stanislaw Halik <sthalik@misaki.pl>
+
+ * Permission to use, copy, modify, and/or distribute this
+ * software for any purpose with or without fee is hereby granted,
+ * provided that the above copyright notice and this permission
+ * notice appear in all copies.
+ */
+
 #include "process_detector.h"
 #include "facetracknoir/ui.h"
 #include <QList>
diff --git a/facetracknoir/process_detector.h b/facetracknoir/process_detector.h
index 3cebd422..792a941f 100644
--- a/facetracknoir/process_detector.h
+++ b/facetracknoir/process_detector.h
@@ -1,3 +1,11 @@
+/* Copyright (c) 2015, Stanislaw Halik <sthalik@misaki.pl>
+
+ * Permission to use, copy, modify, and/or distribute this
+ * software for any purpose with or without fee is hereby granted,
+ * provided that the above copyright notice and this permission
+ * notice appear in all copies.
+ */
+
 #pragma once
 
 #include <QObject>
diff --git a/facetracknoir/ui.cpp b/facetracknoir/ui.cpp
index 1d9f3702..8501e2ae 100644
--- a/facetracknoir/ui.cpp
+++ b/facetracknoir/ui.cpp
@@ -21,6 +21,15 @@
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, see <http://www.gnu.org/licenses/>.
 *********************************************************************************/
+
+/* Copyright (c) 2013-2015, Stanislaw Halik <sthalik@misaki.pl>
+
+ * Permission to use, copy, modify, and/or distribute this
+ * software for any purpose with or without fee is hereby granted,
+ * provided that the above copyright notice and this permission
+ * notice appear in all copies.
+ */
+
 #include "ui.h"
 #include "opentrack/tracker.h"
 #include "opentrack/options.hpp"
diff --git a/facetracknoir/ui.h b/facetracknoir/ui.h
index ccd82e5b..2253ec80 100644
--- a/facetracknoir/ui.h
+++ b/facetracknoir/ui.h
@@ -22,6 +22,14 @@
 * with this program; if not, see <http://www.gnu.org/licenses/>.
 *********************************************************************************/
 
+/* Copyright (c) 2014-2015, Stanislaw Halik <sthalik@misaki.pl>
+
+ * Permission to use, copy, modify, and/or distribute this
+ * software for any purpose with or without fee is hereby granted,
+ * provided that the above copyright notice and this permission
+ * notice appear in all copies.
+ */
+
 #pragma once
 
 #include <QMainWindow>