Merge branch 'richarl/fix-license-headers/PR-788'

* richarl/fix-license-headers/PR-788:
  Make use of the Header feature in yecc
  Remove Emacs timestamp markers
  Remove obsolete CVS keyword markup
  Update obsolete author e-mails
  Replace broken example URL
  Add missing entries to COPYRIGHT file
  Correct copyright on stdlib files
  Add license headers to hipe files in kernel
  Correct copyright info on typer files
  Correct copyright and license on dialyzer files
  Correct copyright on remaining hipe files
  Correct copyright info on hipe cerl files
  Correct copyright info on cerl-related files
  Correct the copyright info in docgen_edoc_xml_cb
  Update Syntax Tools license headers
  Remove some obsolete files
  Update EDoc license headers to dual Apache2/LGPL
  Update EUnit license headers to dual Apache2/LGPL

1 files changed, 10 insertions, 0 deletions

diff --git a/lib/syntax_tools/src/merl_tests.erl b/lib/syntax_tools/src/merl_tests.erl
index 27db594050..61efc6935e 100644
--- a/lib/syntax_tools/src/merl_tests.erl
+++ b/lib/syntax_tools/src/merl_tests.erl
@@ -9,6 +9,16 @@
 %% See the License for the specific language governing permissions and
 %% limitations under the License.
 %%
+%% Alternatively, you may use this file under the terms of the GNU Lesser
+%% General Public License (the "LGPL") as published by the Free Software
+%% Foundation; either version 2.1, or (at your option) any later version.
+%% If you wish to allow use of your version of this file only under the
+%% terms of the LGPL, you should delete the provisions above and replace
+%% them with the notice and other provisions required by the LGPL; see
+%% <http://www.gnu.org/licenses/>. If you do not delete the provisions
+%% above, a recipient may use your version of this file under the terms of
+%% either the Apache License or the LGPL.
+%%
 %% @author Richard Carlsson <[email protected]>
 %% @copyright 2012-2015 Richard Carlsson
 %% @doc Unit tests for merl.