Merge remote branch 'upstream/master'

Conflicts:
	Jamroot
	bjam
	decoder/Jamfile
	decoder/cdec.cc
	dpmert/Jamfile
	jam-files/sanity.jam
	klm/lm/Jamfile
	klm/util/Jamfile
	mira/Jamfile

1 files changed, 0 insertions, 23 deletions

diff --git a/gi/posterior-regularisation/prjava/src/test/IntDoublePair.java b/gi/posterior-regularisation/prjava/src/test/IntDoublePair.java
deleted file mode 100644
index 3f9f0ad7..00000000
--- a/gi/posterior-regularisation/prjava/src/test/IntDoublePair.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package test;

-

-public class IntDoublePair implements Comparable{

-	double val;

-	int idx;

-	public int compareTo(Object o){

-		if(o instanceof IntDoublePair){

-			IntDoublePair pair=(IntDoublePair)o;

-			if(pair.val>val){

-				return 1;

-			}

-			if(pair.val<val){

-				return -1;

-			}

-			return 0;

-		}

-		return -1;

-	}

-	public IntDoublePair(int i,double v){

-		val=v;

-		idx=i;

-	}

-}