diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-09-06 10:32:40 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-09-06 10:32:40 +0200 |
| commit | 2d33b998c72d57abcde836bd2985ad72265d9697 (patch) | |
| tree | 7e6cb902694ac348b6b785a14a997451d0b80951 /parser/html/nsHtml5MetaScanner.cpp | |
| parent | 47f4227deac7db16fbb8f4aec0376f552fc296b5 (diff) | |
| parent | 9fdff854ebf1fe1a118061d57fd0a2d6c5c7dfd7 (diff) | |
| download | UXP-2d33b998c72d57abcde836bd2985ad72265d9697.tar UXP-2d33b998c72d57abcde836bd2985ad72265d9697.tar.gz UXP-2d33b998c72d57abcde836bd2985ad72265d9697.tar.lz UXP-2d33b998c72d57abcde836bd2985ad72265d9697.tar.xz UXP-2d33b998c72d57abcde836bd2985ad72265d9697.zip | |
Merge branch 'release' into Pale_Moon-release
# Conflicts:
# application/palemoon/config/version.txt
Diffstat (limited to 'parser/html/nsHtml5MetaScanner.cpp')
| -rw-r--r-- | parser/html/nsHtml5MetaScanner.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/parser/html/nsHtml5MetaScanner.cpp b/parser/html/nsHtml5MetaScanner.cpp index 24f17b02b..b9c426c19 100644 --- a/parser/html/nsHtml5MetaScanner.cpp +++ b/parser/html/nsHtml5MetaScanner.cpp @@ -1,6 +1,7 @@ /* * Copyright (c) 2007 Henri Sivonen * Copyright (c) 2008-2015 Mozilla Foundation + * Copyright (c) 2019 Moonchild Productions * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -21,11 +22,6 @@ * DEALINGS IN THE SOFTWARE. */ -/* - * THIS IS A GENERATED FILE. PLEASE DO NOT EDIT. - * Please edit MetaScanner.java instead and regenerate. - */ - #define nsHtml5MetaScanner_cpp__ #include "nsIAtom.h" |