Merge branch 'master' of github.com:moses-smt/mosesdecoder

moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerExample.h

@@ -35,8 +35,8 @@ class ChartRuleLookupManagerExample  : public ChartRuleLookupManager
 {
 public:
   ChartRuleLookupManagerExample(const ChartParser &parser,
-                                 const ChartCellCollectionBase &cellColl,
-                                 const ExamplePT &skeletonPt);
+                                const ChartCellCollectionBase &cellColl,
+                                const ExamplePT &skeletonPt);
 
   ~ChartRuleLookupManagerExample();
 

moses2/FF/ExampleStatelessFF.cpp

@@ -12,7 +12,7 @@ namespace Moses2
 {
 
 ExampleStatelessFF::ExampleStatelessFF(size_t startInd,
-    const std::string &line) :
+                                       const std::string &line) :
   StatelessFeatureFunction(startInd, line)
 {
   ReadParameters();

scripts/generic/mteval-v12.pl

@@ -1,7 +1,4 @@
 #!/usr/bin/env perl
-#
-# This file is part of moses.  Its use is licensed under the GNU Lesser General
-# Public License version 2.1 or, at your option, any later version.
 
 use warnings;
 use strict;

scripts/generic/mteval-v13a.pl

@@ -1,7 +1,4 @@
 #!/usr/bin/env perl
-#
-# This file is part of moses.  Its use is licensed under the GNU Lesser General
-# Public License version 2.1 or, at your option, any later version.
 
 use warnings;
 use strict;