From bb941c01f6571524ecae01da5b51a4a4acf243aa Mon Sep 17 00:00:00 2001
From: dowobeha <dowobeha@1f5c12ca-751b-0410-a591-d2e778427230>
Date: Fri, 13 May 2011 18:07:21 +0000
Subject: Merge branch 'master' into local-trunk

git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3971 1f5c12ca-751b-0410-a591-d2e778427230
---
 .gitignore | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 77987e8ee..14834115d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,23 @@
 *.[oa]
+*~
+CreateOnDisk/src/.deps
+CreateOnDisk/src/CreateOnDiskPt
 Makefile
 Makefile.in
+OnDiskPt/src/.deps
 aclocal.m4
 autom4te.cache/
 config.h
 config.log
 config.status
 configure
+kenlm/.deps
+kenlm/.libs
+kenlm/*.la
+kenlm/*.lo
+kenlm/build_binary
+kenlm/query
+libtool
 mert/.deps/
 mert/Makefile
 mert/Makefile.in
@@ -18,16 +29,26 @@ misc/Makefile.in
 misc/processLexicalTable
 misc/processPhraseTable
 misc/queryLexicalTable
+misc/queryPhraseTable
+moses-chart/src/.deps
+moses-chart-cmd/src/.deps
+moses-chart-cmd/src/moses_chart
 moses-cmd/src/.deps/
 moses-cmd/src/Makefile
 moses-cmd/src/Makefile.in
+moses-cmd/src/checkplf
+moses-cmd/src/lmbrgrid
 moses-cmd/src/moses
 moses/src/.deps/
+moses/src/.libs
+moses/src/*.lo
 moses/src/Makefile
 moses/src/Makefile.in
+moses/src/libmoses.la
 scripts/training/cmert-0.5/mert
 scripts/training/mbr/mbr
 scripts/training/phrase-extract/extract
 scripts/training/phrase-extract/score
 scripts/training/symal/symal
+server/.deps
 stamp-h1
-- 
cgit v1.2.3