Merge pull request #26 from computerquip/upstream-merged

Add copyright and name to files it applies to.

libobs-opengl/gl-subsystem.c

@@ -1,5 +1,6 @@
 /******************************************************************************
     Copyright (C) 2013 by Hugh Bailey <[email protected]>
+    Copyright (C) 2014 by Zachary Lund <[email protected]>
 
     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

libobs-opengl/gl-x11.c

@@ -1,3 +1,19 @@
+/******************************************************************************
+    Copyright (C) 2014 by Zachary Lund <[email protected]>
+
+    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, see <http://www.gnu.org/licenses/>.
+******************************************************************************/
 #include <X11/Xlib.h>
 
 #include <stdio.h>

libobs/obs-nix.c

@@ -1,5 +1,6 @@
 /******************************************************************************
     Copyright (C) 2013 by Hugh Bailey <[email protected]>
+    Copyright (C) 2014 by Zachary Lund <[email protected]>
 
     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

obs/platform-x11.cpp

@@ -1,5 +1,6 @@
 /******************************************************************************
     Copyright (C) 2013 by Hugh Bailey <[email protected]>
+    Copyright (C) 2014 by Zachary Lund <[email protected]>
 
     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

obs/window-basic-main.cpp

@@ -1,5 +1,6 @@
 /******************************************************************************
     Copyright (C) 2013 by Hugh Bailey <[email protected]>
+    Copyright (C) 2014 by Zachary Lund <[email protected]>
 
     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

obs/wx-wrappers.cpp

@@ -1,6 +1,7 @@
 /******************************************************************************
     Copyright (C) 2013 by Hugh Bailey <[email protected]>
-
+    Copyright (C) 2014 by Zachary Lund <[email protected]>
+ 
     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