From: GitHub <no...@gi...> - 2012-11-12 21:13:12
|
Branch: refs/heads/master Home: https://github.com/moses-smt/mosesdecoder Commit: 125fdbcff6bcebf793a033f984827e59f98f0788 https://github.com/moses-smt/mosesdecoder/commit/125fdbcff6bcebf793a033f984827e59f98f0788 Author: Hieu Hoang <hie...@gm...> Date: 2012-11-12 (Mon, 12 Nov 2012) Changed paths: M Jamroot A moses-cmd/IOWrapper.cpp A moses-cmd/IOWrapper.h A moses-cmd/Jamfile A moses-cmd/LatticeMBR.cpp A moses-cmd/LatticeMBR.h A moses-cmd/LatticeMBRGrid.cpp A moses-cmd/Main.cpp A moses-cmd/Main.h A moses-cmd/TranslationAnalysis.cpp A moses-cmd/TranslationAnalysis.h A moses-cmd/mbr.cpp A moses-cmd/mbr.h R moses-cmd/src/IOWrapper.cpp R moses-cmd/src/IOWrapper.h R moses-cmd/src/Jamfile R moses-cmd/src/LatticeMBR.cpp R moses-cmd/src/LatticeMBR.h R moses-cmd/src/LatticeMBRGrid.cpp R moses-cmd/src/Main.cpp R moses-cmd/src/Main.h R moses-cmd/src/TranslationAnalysis.cpp R moses-cmd/src/TranslationAnalysis.h R moses-cmd/src/mbr.cpp R moses-cmd/src/mbr.h Log Message: ----------- move moses-cmd/src/* to moses-cmd/ Commit: 0bc0b853581bbdc00a3403edc69e76d02fbfde3a https://github.com/moses-smt/mosesdecoder/commit/0bc0b853581bbdc00a3403edc69e76d02fbfde3a Author: Hieu Hoang <hie...@gm...> Date: 2012-11-12 (Mon, 12 Nov 2012) Changed paths: M Jamroot M contrib/other-builds/moses-chart-cmd/.project M contrib/other-builds/moses-cmd/.cproject M contrib/other-builds/moses-cmd/.project A moses-chart-cmd/IOWrapper.cpp A moses-chart-cmd/IOWrapper.h A moses-chart-cmd/Jamfile A moses-chart-cmd/Main.cpp A moses-chart-cmd/Main.h A moses-chart-cmd/TranslationAnalysis.cpp A moses-chart-cmd/TranslationAnalysis.h A moses-chart-cmd/mbr.cpp A moses-chart-cmd/mbr.h R moses-chart-cmd/src/IOWrapper.cpp R moses-chart-cmd/src/IOWrapper.h R moses-chart-cmd/src/Jamfile R moses-chart-cmd/src/Main.cpp R moses-chart-cmd/src/Main.h R moses-chart-cmd/src/TranslationAnalysis.cpp R moses-chart-cmd/src/TranslationAnalysis.h R moses-chart-cmd/src/mbr.cpp R moses-chart-cmd/src/mbr.h M moses-cmd/Jamfile M moses-cmd/LatticeMBRGrid.cpp M moses-cmd/Main.cpp M regression-testing/Jamfile Log Message: ----------- resolved merge conflicts Compare: https://github.com/moses-smt/mosesdecoder/compare/44f24bd67398...0bc0b853581b |