diff options
author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2019-05-11 22:19:05 +0300 |
---|---|---|
committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2019-05-11 22:19:05 +0300 |
commit | cb248f880619431850e5638009a6098048050edf (patch) | |
tree | 32858b1936d56c8391abf003fbdf6a9d6ba9a5e9 /strings/conf_to_src.c | |
parent | c0ac0b886047496e105a566a063bf1bd932d00a4 (diff) | |
parent | 5543b75550962f07b4adcd47a6e52accec0a7d0f (diff) | |
download | mariadb-git-cb248f880619431850e5638009a6098048050edf.tar.gz |
Merge branch '5.5' into 10.1
Diffstat (limited to 'strings/conf_to_src.c')
-rw-r--r-- | strings/conf_to_src.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/strings/conf_to_src.c b/strings/conf_to_src.c index 28d2fd1515e..6c352db7437 100644 --- a/strings/conf_to_src.c +++ b/strings/conf_to_src.c @@ -14,7 +14,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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include "strings_def.h" #include <m_ctype.h> @@ -285,7 +285,7 @@ fprint_copyright(FILE *file) "\n" " You should have received a copy of the GNU General Public License\n" " along with this program; if not, write to the Free Software\n" -" Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */\n" +" Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */\n" "\n"); } |