• unknown's avatar
    Merge with 4.0 · a8217039
    unknown authored
    
    BitKeeper/etc/ignore:
      auto-union
    BitKeeper/etc/logging_ok:
      auto-union
    BitKeeper/deleted/.del-compile-netware-standard:
      Delete: netware/BUILD/compile-netware-standard
    BitKeeper/deleted/.del-mwenv:
      Delete: netware/BUILD/mwenv
    BitKeeper/deleted/.del-nwbootstrap:
      Delete: netware/BUILD/nwbootstrap
    BitKeeper/deleted/.del-compile-AUTOTOOLS:
      Delete: netware/BUILD/compile-AUTOTOOLS
    BitKeeper/deleted/.del-compile-linux-tools:
      Delete: netware/BUILD/compile-linux-tools
    BitKeeper/deleted/.del-compile-netware-END:
      Delete: netware/BUILD/compile-netware-END
    BitKeeper/deleted/.del-compile-netware-START:
      Delete: netware/BUILD/compile-netware-START
    BitKeeper/deleted/.del-compile-netware-all:
      Delete: netware/BUILD/compile-netware-all
    BitKeeper/deleted/.del-compile-netware-debug:
      Delete: netware/BUILD/compile-netware-debug
    BitKeeper/deleted/.del-mwasmnlm~bc5746809d67feb5:
      Auto merged
    BitKeeper/deleted/.del-mwenv~35c8b56062f4b6aa:
      Auto merged
    BitKeeper/deleted/.del-mwccnlm~be63afd25a14...
    a8217039
lock.cc 19.8 KB