[phobos] [D-Programming-Language/phobos] dfd431: 6116

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/D-Programming-Language/phobos
  Commit: dfd4319102eceb7044a8ebc59fdf971d60792133
      https://github.com/D-Programming-Language/phobos/commit/dfd4319102eceb7044a8ebc59fdf971d60792133
  Author: Sean Kelly <sean at invisibleduck.org>
  Date:   2012-04-24 (Tue, 24 Apr 2012)

  Changed paths:
    M changelog.dd

  Log Message:
  -----------
  6116


  Commit: 1980e72fc42a335b19c6239deac75182ff9f7c90
      https://github.com/D-Programming-Language/phobos/commit/1980e72fc42a335b19c6239deac75182ff9f7c90
  Author: Sean Kelly <sean at invisibleduck.org>
  Date:   2012-04-24 (Tue, 24 Apr 2012)

  Changed paths:
    M changelog.dd
    M etc/c/sqlite3.d
    M posix.mak
    R std/__fileinit.d
    M std/algorithm.d
    M std/array.d
    M std/base64.d
    M std/bigint.d
    M std/bind.d
    M std/bitmanip.d
    M std/concurrency.d
    M std/container.d
    M std/conv.d
    M std/cpuid.d
    M std/cstream.d
    M std/ctype.d
    R std/date.d
    R std/datebase.d
    R std/dateparse.d
    M std/datetime.d
    M std/exception.d
    M std/file.d
    M std/format.d
    R std/gregorian.d
    M std/internal/uni.d
    M std/math.d
    M std/mmfile.d
    M std/net/curl.d
    M std/net/isemail.d
    M std/numeric.d
    M std/path.d
    M std/random.d
    M std/range.d
    M std/regex.d
    M std/regexp.d
    M std/socket.d
    M std/stdio.d
    M std/stream.d
    M std/string.d
    M std/traits.d
    M std/typecons.d
    M std/typetuple.d
    M std/uni.d
    M std/utf.d
    M std/variant.d
    M std/windows/registry.d
    M std/xml.d
    M unittest.d
    M win32.mak

  Log Message:
  -----------
  resolved merge conflict


Compare: https://github.com/D-Programming-Language/phobos/compare/95d74cd...1980e72