sync with master lf files to resolve conflicts

[proxmark3-svn] / client / proxgui.cpp

diff --git a/client/proxgui.cpp b/client/proxgui.cpp
index 2858157caf53c28ffe2f9a0ec66f2ac04945c449..12faab79cd3d7eb002d50b2dd53b06ce34989913 100644 (file)
--- a/client/proxgui.cpp
+++ b/client/proxgui.cpp
@@ -1,3 +1,13 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2009 Michael Gernoth <michael at gernoth.net>
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// GUI functions
+//-----------------------------------------------------------------------------
+
 #include "proxgui.h"
 #include "proxguiqt.h"