• unknown's avatar
    merged · 4c053210
    unknown authored
    
    BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
      Auto merged
    BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    sql/share/russian/errmsg.txt:
      merged (partially translated)
    4c053210
errmsg.txt 13 KB