• unknown's avatar
    Merge mysql.com:/home/kent/bk/sotest/mysql-5.0-build · 220bbe82
    unknown authored
    into  mysql.com:/home/kent/bk/sotest/mysql-5.1-build
    
    
    BitKeeper/deleted/.del-SETUP.sh.rej:
      Auto merged
    BitKeeper/deleted/.del-configure.in.rej:
      Auto merged
    BitKeeper/deleted/.del-my_global.h.rej:
      Auto merged
    BitKeeper/deleted/.del-my_pthread.h.rej:
      Auto merged
    BitKeeper/deleted/.del-thr_alarm.c.rej:
      Auto merged
    config/ac-macros/zlib.m4:
      Auto merged
    configure.in:
      Auto merged
    zlib/Makefile.am:
      Auto merged
    scripts/make_binary_distribution.sh:
      SCCS merged
    220bbe82
zlib.m4 4.54 KB