Commit Graph

4 Commits

Author SHA1 Message Date
Ulrich Germann
e642fc4669 Merge branch 'master' of http://github.com/moses-smt/mosesdecoder
Conflicts:
	moses/parameters/ServerOptions.cpp
2015-09-14 11:02:03 +01:00
Ulrich Germann
349ebdc3e9 ServerOptions.cpp would't compile on systems where size_t != unsigned long int. 2015-09-14 10:56:48 +01:00
Hieu Hoang
f6853ee37d casting problem on some compilers 2015-09-14 11:25:24 +02:00
Ulrich Germann
faaf0bdf87 Reorganization of server options. Added options for sesssion cache. 2015-08-01 16:11:35 +01:00