summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorVincent Guittot <vincent.guittot@linaro.org>2014-08-01 13:44:22 +0200
committerVincent Guittot <vincent.guittot@linaro.org>2014-08-01 15:43:45 +0200
commitca1a626a500da8ca5226adf252aced93fd28de79 (patch)
tree9da2189727e84f5ca631b95a34e3d534d9e20ab1 /doc
parentf9ede3a39f1c9f73ea209cb832f78c0c651cb073 (diff)
move merge examples files in examples directory
Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>
Diffstat (limited to 'doc')
-rw-r--r--doc/examples/merge/global.json (renamed from doc/global.json)0
-rw-r--r--doc/examples/merge/resources.json (renamed from doc/resources.json)0
-rw-r--r--doc/examples/merge/thread0.json (renamed from doc/thread0.json)0
-rw-r--r--doc/examples/merge/thread1.json (renamed from doc/thread1.json)0
-rw-r--r--doc/examples/merge/thread2.json (renamed from doc/thread2.json)0
-rw-r--r--doc/examples/merge/thread3.json (renamed from doc/thread3.json)0
6 files changed, 0 insertions, 0 deletions
diff --git a/doc/global.json b/doc/examples/merge/global.json
index 58dbfb3..58dbfb3 100644
--- a/doc/global.json
+++ b/doc/examples/merge/global.json
diff --git a/doc/resources.json b/doc/examples/merge/resources.json
index 11142c9..11142c9 100644
--- a/doc/resources.json
+++ b/doc/examples/merge/resources.json
diff --git a/doc/thread0.json b/doc/examples/merge/thread0.json
index e845e18..e845e18 100644
--- a/doc/thread0.json
+++ b/doc/examples/merge/thread0.json
diff --git a/doc/thread1.json b/doc/examples/merge/thread1.json
index 37fea77..37fea77 100644
--- a/doc/thread1.json
+++ b/doc/examples/merge/thread1.json
diff --git a/doc/thread2.json b/doc/examples/merge/thread2.json
index 024cefa..024cefa 100644
--- a/doc/thread2.json
+++ b/doc/examples/merge/thread2.json
diff --git a/doc/thread3.json b/doc/examples/merge/thread3.json
index 98a07eb..98a07eb 100644
--- a/doc/thread3.json
+++ b/doc/examples/merge/thread3.json