diff options
| author | Jon Ashburn <jon@lunarg.com> | 2015-11-03 11:57:00 -0700 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-11-04 13:15:19 -0700 |
| commit | 66bf9b5691f424734df03ca6173bf2a18d71ed78 (patch) | |
| tree | 14e1bde65354c985af699408e4879b4d392c2d96 | |
| parent | 37328984e2247ffd247d4b175a1baf5d66b87aed (diff) | |
| download | usermoji-66bf9b5691f424734df03ca6173bf2a18d71ed78.tar.xz | |
misc: Fix build errors from the author changes
| -rwxr-xr-x | vk-layer-generate.py | 4 | ||||
| -rwxr-xr-x | vk_helper.py | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/vk-layer-generate.py b/vk-layer-generate.py index 669b591d..b55ea543 100755 --- a/vk-layer-generate.py +++ b/vk-layer-generate.py @@ -27,9 +27,7 @@ # Author: Mark Lobodzinski <mark@lunarg.com> # Author: Mike Stroyan <mike@LunarG.com> # Author: Tony Barbour <tony@LunarG.com> -# -# Authors: -# Chia-I Wu <olv@lunarg.com> +# Author: Chia-I Wu <olv@lunarg.com> import sys import os diff --git a/vk_helper.py b/vk_helper.py index e56fb5ac..1eb3ddf1 100755 --- a/vk_helper.py +++ b/vk_helper.py @@ -550,6 +550,12 @@ class StructWrapperGen: copyright.append(' * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING'); copyright.append(' * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER'); copyright.append(' * DEALINGS IN THE SOFTWARE.'); +<<<<<<< HEAD +======= + copyright.append(' *') + copyright.append(' * Author: Courtney Goeltzenleuchter <courtney@LunarG.com>') + copyright.append(' * Author: Tobin Ehlis <tobin@lunarg.com>') +>>>>>>> 2edc2f8... misc: Fix build errors from the author changes copyright.append(' */'); copyright.append(''); return "\n".join(copyright) |