[Mosesdecoder-commits] SF.net SVN: mosesdecoder:[3074] trunk/moses/src

[<bo...@us...>]

Revision: 3074
          http://mosesdecoder.svn.sourceforge.net/mosesdecoder/?rev=3074&view=rev
Author:   bojar
Date:     2010-04-08 14:52:35 +0000 (Thu, 08 Apr 2010)

Log Message:
-----------
Merge branch 'bilingualSA' into moses-svn

Conflicts:

	moses/src/DynSAInclude/file.h

Modified Paths:
--------------
    trunk/moses/src/DynSAInclude/fdstream.h
    trunk/moses/src/DynSAInclude/file.cpp
    trunk/moses/src/DynSAInclude/file.h
    trunk/moses/src/DynSAInclude/utils.h
    trunk/moses/src/DynSAInclude/vocab.cpp
    trunk/moses/src/DynSAInclude/vocab.h
    trunk/moses/src/DynSuffixArray.cpp
    trunk/moses/src/DynSuffixArray.h
    trunk/moses/src/Makefile.am
    trunk/moses/src/PhraseDictionaryDynSuffixArray.cpp
    trunk/moses/src/PhraseDictionaryDynSuffixArray.h

Added Paths:
-----------
    trunk/moses/src/BilingualDynSuffixArray.cpp
    trunk/moses/src/BilingualDynSuffixArray.h


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.