Merge branch 'master' of https://github.com/nyatla/NyARToolkit

# Conflicts: # lib/src/jp/nyatla/nyartoolkit/core/marker/nft/NyARNftDataSet.java
nyatla · May 23, 2016 · 71dd6a5 · 71dd6a5
2 parents e35c10d + bae68d8
commit 71dd6a5
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/lib/src/jp/nyatla/nyartoolkit/core/marker/nft/NyARNftDataSet.java b/lib/src/jp/nyatla/nyartoolkit/core/marker/nft/NyARNftDataSet.java
@@ -149,7 +149,6 @@ public static NyARNftDataSet loadFromNftFiles(String i_fname_prefix,double i_wid
 	{
 		return loadFromNftFiles(i_fname_prefix,0,i_width_in_msec);
 	}
-
 	public static NyARNftDataSet loadFromNftDataSet(InputStream i_stream,double i_width_in_msec)
 	{		
 		NyARNftDataSetFile nfp;
@@ -168,8 +167,6 @@ public static NyARNftDataSet loadFromNftDataSet(String i_fname)
 	{	
 		return loadFromNftDataSet(i_fname,Double.NaN);
 	}
-
-
 	public static void main(String[] args){
 	}