diff options
| author | Barry Haddow <barry.haddow@gmail.com> | 2012-09-27 01:49:33 +0400 |
|---|---|---|
| committer | Barry Haddow <barry.haddow@gmail.com> | 2012-09-27 01:49:33 +0400 |
| commit | 0a950ee9f4227c8afbbe58d03a854745479ffbc0 (patch) | |
| tree | 3e4515adc6b3323f8742ff5addde2f29da2002c8 /.gitignore | |
| parent | 1ce788e2b83dc9b359f6132e7e82774f9d0777b1 (diff) | |
| parent | ab60d1ad6f93a78e80e665bc6c7d32b61b7c1c52 (diff) | |
Merge remote branch 'github/master' into miramerge
Compiles, but not tested. Had to disable relent filter. Strangely, it seems to contain the
whole of moses-cmd.
Conflicts:
Jamroot
OnDiskPt/TargetPhrase.cpp
moses-cmd/src/Main.cpp
moses/src/AlignmentInfo.cpp
moses/src/AlignmentInfo.h
moses/src/ChartTranslationOptionCollection.cpp
moses/src/ChartTranslationOptionCollection.h
moses/src/GenerationDictionary.cpp
moses/src/Jamfile
moses/src/Parameter.cpp
moses/src/PhraseDictionary.cpp
moses/src/StaticData.cpp
moses/src/StaticData.h
moses/src/TargetPhrase.h
moses/src/TranslationSystem.cpp
moses/src/TranslationSystem.h
moses/src/Word.cpp
phrase-extract/score.cpp
regression-testing/Jamfile
scripts/ems/experiment.meta
scripts/ems/experiment.perl
scripts/training/train-model.perl
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index be2ad9afb..004f7d759 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,7 @@ scripts/training/train-model.perl dist bin previous.sh +contrib/other-builds/*.xcodeproj/project.xcworkspace/ +contrib/other-builds/*.xcodeproj/xcuserdata/ +*/*.xcodeproj/project.xcworkspace +*/*.xcodeproj/xcuserdata |