diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-13 17:47:26 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-13 17:54:04 +0300 |
| commit | 26a14ee1308df65ebb9dda9a8618e64f2f2fc518 (patch) | |
| tree | 7cad4dffc5fb9f0a8caff5fd62c95a3a8e65ffa8 /plugin/auth_dialog | |
| parent | 8ce702aa90c174566f4ac950e85cc7570bf9b647 (diff) | |
| parent | cb248f880619431850e5638009a6098048050edf (diff) | |
| download | mariadb-git-26a14ee1308df65ebb9dda9a8618e64f2f2fc518.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'plugin/auth_dialog')
| -rw-r--r-- | plugin/auth_dialog/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | plugin/auth_dialog/dialog.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugin/auth_dialog/CMakeLists.txt b/plugin/auth_dialog/CMakeLists.txt index cdc961bb390..b5e1b2beca0 100644 --- a/plugin/auth_dialog/CMakeLists.txt +++ b/plugin/auth_dialog/CMakeLists.txt @@ -12,7 +12,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 # disabled in favor of libmariadb/plugins/auth/dialog.c # diff --git a/plugin/auth_dialog/dialog.c b/plugin/auth_dialog/dialog.c index da937ea6e91..3ea1da229e7 100644 --- a/plugin/auth_dialog/dialog.c +++ b/plugin/auth_dialog/dialog.c @@ -13,7 +13,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 */ /** @file |