summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Simianer <simianer@cl.uni-heidelberg.de>2012-11-19 11:38:45 +0100
committerPatrick Simianer <simianer@cl.uni-heidelberg.de>2012-11-19 11:38:45 +0100
commited54767744bcb5aa164c8c4d2ceab791ce36a550 (patch)
treef833e9c2a3d6346fa7a4055c14f27381803ae326
parent825d217bceeda8a66d7dab74a388f2b6a5313292 (diff)
merge upstream/master
-rw-r--r--training/dtrain/test/parallelize/test/cdec.ini (renamed from training/dtrain/parallelize/test/cdec.ini)0
-rw-r--r--training/dtrain/test/parallelize/test/dtrain.ini (renamed from training/dtrain/parallelize/test/dtrain.ini)0
-rw-r--r--training/dtrain/test/parallelize/test/in (renamed from training/dtrain/parallelize/test/in)0
-rw-r--r--training/dtrain/test/parallelize/test/refs (renamed from training/dtrain/parallelize/test/refs)0
4 files changed, 0 insertions, 0 deletions
diff --git a/training/dtrain/parallelize/test/cdec.ini b/training/dtrain/test/parallelize/test/cdec.ini
index 72e99dc5..72e99dc5 100644
--- a/training/dtrain/parallelize/test/cdec.ini
+++ b/training/dtrain/test/parallelize/test/cdec.ini
diff --git a/training/dtrain/parallelize/test/dtrain.ini b/training/dtrain/test/parallelize/test/dtrain.ini
index 03f9d240..03f9d240 100644
--- a/training/dtrain/parallelize/test/dtrain.ini
+++ b/training/dtrain/test/parallelize/test/dtrain.ini
diff --git a/training/dtrain/parallelize/test/in b/training/dtrain/test/parallelize/test/in
index a312809f..a312809f 100644
--- a/training/dtrain/parallelize/test/in
+++ b/training/dtrain/test/parallelize/test/in
diff --git a/training/dtrain/parallelize/test/refs b/training/dtrain/test/parallelize/test/refs
index 4d3128cb..4d3128cb 100644
--- a/training/dtrain/parallelize/test/refs
+++ b/training/dtrain/test/parallelize/test/refs