mariadb/sql/share
unknown 3d20c8ce52 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1


include/m_string.h:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
2004-02-17 13:15:38 -06:00
..
charsets latin1.xml, Index.xml: 2003-12-29 19:58:18 +04:00
czech Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-02-17 13:15:38 -06:00
danish Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-02-17 13:15:38 -06:00
dutch Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-02-17 13:15:38 -06:00
english Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-02-17 13:15:38 -06:00
estonian Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-02-17 13:15:38 -06:00
french Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-02-17 13:15:38 -06:00
german Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-02-17 13:15:38 -06:00
greek Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-02-17 13:15:38 -06:00
hungarian Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-02-17 13:15:38 -06:00
italian Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-02-17 13:15:38 -06:00
japanese Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-02-17 13:15:38 -06:00
korean Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-02-17 13:15:38 -06:00
norwegian Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-02-17 13:15:38 -06:00
norwegian-ny Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-02-17 13:15:38 -06:00
polish Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-02-17 13:15:38 -06:00
portuguese Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-02-17 13:15:38 -06:00
romanian Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-02-17 13:15:38 -06:00
russian Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-02-17 13:15:38 -06:00
serbian Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-02-16 12:05:25 -06:00
slovak Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-02-17 13:15:38 -06:00
spanish Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-02-17 13:15:38 -06:00
swedish Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-02-17 13:15:38 -06:00
ukrainian Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-02-17 13:15:38 -06:00
.cvsignore
Makefile.am