Commit 8dbc6b1f authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/home/bar/mysql-4.1

into  mysql.com:/usr/home/bar/mysql-5.0


strings/conf_to_src.c:
  Auto merged
parents cabe2859 fafa4c5a
Loading
Loading
Loading
Loading
+0 −244

File changed.

Preview size limit exceeded, changes collapsed.