[moses-smt/mosesdecoder] 37494d: fix phikoehn's merge conflict

[GitHub <no...@gi...>]

  Branch: refs/heads/mert-new
  Home:   https://github.com/moses-smt/mosesdecoder
  Commit: 37494dd673622a88f5445f3daaa638be45ca253f
      https://github.com/moses-smt/mosesdecoder/commit/37494dd673622a88f5445f3daaa638be45ca253f
  Author: Barry Haddow <bar...@gm...>
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
    M scripts/ems/experiment.meta

  Log Message:
  -----------
  fix phikoehn's merge conflict


  Commit: bfae09725cb454f6e544558ea2784adb8c250e34
      https://github.com/moses-smt/mosesdecoder/commit/bfae09725cb454f6e544558ea2784adb8c250e34
  Author: Barry Haddow <bar...@gm...>
  Date:   2012-09-21 (Fri, 21 Sep 2012)

  Changed paths:
    M moses-cmd/src/Main.cpp
    M moses/src/Parameter.cpp
    M moses/src/StaticData.cpp
    M moses/src/StaticData.h
    M moses/src/TranslationOptionCollection.cpp
    M moses/src/TranslationOptionCollection.h

  Log Message:
  -----------
  Add option to dump OOVs to file


  Commit: cfaa124ca9f9b0d75e1610857c4ef8e4efa6cebd
      https://github.com/moses-smt/mosesdecoder/commit/cfaa124ca9f9b0d75e1610857c4ef8e4efa6cebd
  Author: Hieu Hoang <fis...@gm...>
  Date:   2012-09-21 (Fri, 21 Sep 2012)

  Changed paths:
    M moses-cmd/src/Main.cpp
    M moses/src/Parameter.cpp
    M moses/src/StaticData.cpp
    M moses/src/StaticData.h
    M moses/src/TranslationOptionCollection.cpp
    M moses/src/TranslationOptionCollection.h
    M scripts/ems/experiment.meta

  Log Message:
  -----------
  Merge branch 'master' into mert-new


  Commit: e940588c35ca54ee439d7f7c61ac68cd2d041578
      https://github.com/moses-smt/mosesdecoder/commit/e940588c35ca54ee439d7f7c61ac68cd2d041578
  Author: Hieu Hoang <fis...@gm...>
  Date:   2012-09-21 (Fri, 21 Sep 2012)

  Changed paths:
    M moses/src/Parameter.cpp
    M scripts/training/mert-moses.pl

  Log Message:
  -----------
  mert script works with new weights format


  Commit: a372d3a1f157782566af54b3fd612801f84d5cc1
      https://github.com/moses-smt/mosesdecoder/commit/a372d3a1f157782566af54b3fd612801f84d5cc1
  Author: Hieu Hoang <fis...@gm...>
  Date:   2012-09-21 (Fri, 21 Sep 2012)

  Changed paths:
    M moses/src/Parameter.cpp
    M scripts/training/mert-moses.pl
    M scripts/training/train-model.perl
    R scripts/training/zmert-moses.pl

  Log Message:
  -----------
  mert script works with new weights format


  Commit: fac1289f80648e65f6fcfe9e7e51c0b1da2e3cd3
      https://github.com/moses-smt/mosesdecoder/commit/fac1289f80648e65f6fcfe9e7e51c0b1da2e3cd3
  Author: Hieu Hoang <fis...@gm...>
  Date:   2012-09-21 (Fri, 21 Sep 2012)

  Changed paths:
    M scripts/training/train-model.perl

  Log Message:
  -----------
  train-model.perl creates ini file with new weight format


Compare: https://github.com/moses-smt/mosesdecoder/compare/09af536f60a4...fac1289f8064