[dlang.org] [D-Programming-Language/dlang.org] 82fcf3: Merge remote-tracking branch 'upstream/master' int...

Wed Oct 7 14:34:59 PDT 2015

  Branch: refs/heads/master
  Home:   https://github.com/D-Programming-Language/dlang.org
  Commit: 82fcf34459093a208f9b779de874e03f676ee4be
      https://github.com/D-Programming-Language/dlang.org/commit/82fcf34459093a208f9b779de874e03f676ee4be
  Author: Martin Nowak <code at dawg.eu>
  Date:   2015-10-04 (Sun, 04 Oct 2015)

  Changed paths:
    M .htaccess
    M abi.dd
    M arrays.dd
    R changelog.dd
    A changelog/2.000.dd
    A changelog/2.001.dd
    A changelog/2.002.dd
    A changelog/2.003.dd
    A changelog/2.004.dd
    A changelog/2.005.dd
    A changelog/2.006.dd
    A changelog/2.007.dd
    A changelog/2.008.dd
    A changelog/2.009.dd
    A changelog/2.010.dd
    A changelog/2.011.dd
    A changelog/2.012.dd
    A changelog/2.013.dd
    A changelog/2.014.dd
    A changelog/2.015.dd
    A changelog/2.016.dd
    A changelog/2.017.dd
    A changelog/2.018.dd
    A changelog/2.019.dd
    A changelog/2.020.dd
    A changelog/2.021.dd
    A changelog/2.022.dd
    A changelog/2.023.dd
    A changelog/2.025.dd
    A changelog/2.026.dd
    A changelog/2.027.dd
    A changelog/2.028.dd
    A changelog/2.029.dd
    A changelog/2.030.dd
    A changelog/2.031.dd
    A changelog/2.032.dd
    A changelog/2.033.dd
    A changelog/2.034.dd
    A changelog/2.035.dd
    A changelog/2.036.dd
    A changelog/2.037.dd
    A changelog/2.038.dd
    A changelog/2.039.dd
    A changelog/2.040.dd
    A changelog/2.041.dd
    A changelog/2.042.dd
    A changelog/2.043.dd
    A changelog/2.044.dd
    A changelog/2.045.dd
    A changelog/2.046.dd
    A changelog/2.047.dd
    A changelog/2.048.dd
    A changelog/2.049.dd
    A changelog/2.050.dd
    A changelog/2.051.dd
    A changelog/2.052.dd
    A changelog/2.053.dd
    A changelog/2.054.dd
    A changelog/2.055.dd
    A changelog/2.056.dd
    A changelog/2.057.dd
    A changelog/2.058.dd
    A changelog/2.059.dd
    A changelog/2.060.dd
    A changelog/2.061.dd
    A changelog/2.062.dd
    A changelog/2.063.dd
    A changelog/2.064.dd
    A changelog/2.065.0.dd
    A changelog/2.066.0.dd
    A changelog/2.066.1.dd
    A changelog/2.067.0.dd
    A changelog/2.067.1.dd
    A changelog/2.068.0.dd
    A changelog/2.068.1.dd
    A changelog/2.068.2.dd
    A changelog/changelog.ddoc
    A changelog/index.dd
    A changelog/upcoming.dd
    M class.dd
    M code_coverage.dd
    M const3.dd
    M css/style.css
    A ctarguments.dd
    M dcompiler.dd
    M deprecate.dd
    M dlang.org.ddoc
    M doc.ddoc
    M download.dd
    M dpl-docs/views/layout.dt
    M enum.dd
    M expression.dd
    M features2.dd
    M glossary.dd
    M grammar.dd
    M hash-map.dd
    M html.ddoc
    M iasm.dd
    A images/compiler-dmd.png
    A images/compiler-gdc.svg
    A images/compiler-ldc.ai
    A images/compiler-ldc.png
    A images/hamburger.svg
    M index.dd
    M intro-to-datetime.dd
    M js/dlang.js
    M js/run.js
    M latex.ddoc
    M migrate-to-shared.dd
    M overview.dd
    M portability.dd
    M posix.mak
    M pragma.dd
    R process.php
    M property.dd
    M regular-expression.dd
    M simd.dd
    M spec.dd
    M std.ddoc
    M std_navbar-prerelease.ddoc
    M std_navbar-release.ddoc
    M traits.dd
    M tuple.dd
    M version.dd
    M win32.mak

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into stable


  Commit: 40cf7590c27c9b0fdd82935482b7f049a21e401f
      https://github.com/D-Programming-Language/dlang.org/commit/40cf7590c27c9b0fdd82935482b7f049a21e401f
  Author: Martin Nowak <code at dawg.eu>
  Date:   2015-10-07 (Wed, 07 Oct 2015)

  Changed paths:
    M changelog/2.068.2.dd
    A changelog/2.069.0.dd
    M changelog/index.dd
    M win32.mak

  Log Message:
  -----------
  changelog for 2.069.0


  Commit: e6cb4fad2832cc2cbaf4805a45382b871c600b82
      https://github.com/D-Programming-Language/dlang.org/commit/e6cb4fad2832cc2cbaf4805a45382b871c600b82
  Author: Martin Nowak <code at dawg.eu>
  Date:   2015-10-07 (Wed, 07 Oct 2015)

  Changed paths:
    M css/style.css
    M download.dd

  Log Message:
  -----------
  add beta channel to download page


  Commit: 47022257ebf4db790403034243ab698741360ab8
      https://github.com/D-Programming-Language/dlang.org/commit/47022257ebf4db790403034243ab698741360ab8
  Author: Martin Nowak <code at dawg.eu>
  Date:   2015-10-07 (Wed, 07 Oct 2015)

  Changed paths:
    M changelog/2.069.0.dd
    M changelog/changelog.ddoc

  Log Message:
  -----------
  clarify that 2.069.0 is still in beta


  Commit: d144009bed028658c9a0da8c5c0f4d49d99315dc
      https://github.com/D-Programming-Language/dlang.org/commit/d144009bed028658c9a0da8c5c0f4d49d99315dc
  Author: Vladimir Panteleev <github.private at thecybershadow.net>
  Date:   2015-10-07 (Wed, 07 Oct 2015)

  Changed paths:
    M changelog/2.068.2.dd
    A changelog/2.069.0.dd
    M changelog/changelog.ddoc
    M changelog/index.dd
    M css/style.css
    M download.dd
    M win32.mak

  Log Message:
  -----------
  Merge pull request #1116 from MartinNowak/beta

beta preparation


  Commit: 12937937497573c16e87f146a7e83f36c23b2d6e
      https://github.com/D-Programming-Language/dlang.org/commit/12937937497573c16e87f146a7e83f36c23b2d6e
  Author: Martin Nowak <code at dawg.eu>
  Date:   2015-10-07 (Wed, 07 Oct 2015)

  Changed paths:
    M win32.mak

  Log Message:
  -----------
  fix win32.mak makefile


  Commit: 472fefe640f5877b910601ce05a954b630f1daf9
      https://github.com/D-Programming-Language/dlang.org/commit/472fefe640f5877b910601ce05a954b630f1daf9
  Author: Martin Nowak <code at dawg.eu>
  Date:   2015-10-07 (Wed, 07 Oct 2015)

  Changed paths:
    M changelog/2.068.2.dd
    A changelog/2.069.0.dd
    M changelog/changelog.ddoc
    M changelog/index.dd
    M css/style.css
    M download.dd
    M win32.mak

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/stable' into merge_stable

# Conflicts:
#	win32.mak


  Commit: 28523ce035e57c6958522eac1e863f57b1953dac
      https://github.com/D-Programming-Language/dlang.org/commit/28523ce035e57c6958522eac1e863f57b1953dac
  Author: Martin Nowak <code at dawg.eu>
  Date:   2015-10-07 (Wed, 07 Oct 2015)

  Changed paths:
    M changelog/2.068.2.dd
    A changelog/2.069.0.dd
    M changelog/changelog.ddoc
    M changelog/index.dd
    M css/style.css
    M download.dd
    M win32.mak

  Log Message:
  -----------
  Merge pull request #1117 from MartinNowak/merge_stable

Merge remote-tracking branch 'upstream/stable' into merge_stable


Compare: https://github.com/D-Programming-Language/dlang.org/compare/26155d8e7048...28523ce035e5