diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-23 10:32:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-23 10:32:21 +0300 |
| commit | 826f9d4f7e99973cafe7654697d7c50b8b64b76b (patch) | |
| tree | 8e41c3a90d40c21c37fcbd0658afe7d349865540 /sql/share/charsets/macroman.xml | |
| parent | e5d71e0b3d3ebd4e69526002720f93d62a3fd641 (diff) | |
| parent | 31fe70290c54c44231aed881f5138924f32e47c5 (diff) | |
| download | mariadb-git-826f9d4f7e99973cafe7654697d7c50b8b64b76b.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/share/charsets/macroman.xml')
| -rw-r--r-- | sql/share/charsets/macroman.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/share/charsets/macroman.xml b/sql/share/charsets/macroman.xml index 4ee8dc1f952..711a391457c 100644 --- a/sql/share/charsets/macroman.xml +++ b/sql/share/charsets/macroman.xml @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA </copyright> <charset name="macroman"> |