aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Savchenko <bircoph@gmail.com>2015-04-08 05:24:39 +0300
committerAndrew Savchenko <bircoph@gmail.com>2015-04-08 05:24:39 +0300
commitbbc44bbf34362d51d8e9b6626c36c3cf73049ddb (patch)
treeee3c9123cf5411a79098b4b4421293582fa6aeab /app-doc/root-docs/files
parentsci-physics/root: version bump (diff)
downloadsci-bbc44bbf34362d51d8e9b6626c36c3cf73049ddb.tar.gz
sci-bbc44bbf34362d51d8e9b6626c36c3cf73049ddb.tar.bz2
sci-bbc44bbf34362d51d8e9b6626c36c3cf73049ddb.zip
app-doc/root-docs: version bump
Diffstat (limited to 'app-doc/root-docs/files')
-rw-r--r--app-doc/root-docs/files/root-docs-6.00.01-fillpatterns.patch30
-rw-r--r--app-doc/root-docs/files/root-docs-6.02.05-jsroot.patch11
2 files changed, 11 insertions, 30 deletions
diff --git a/app-doc/root-docs/files/root-docs-6.00.01-fillpatterns.patch b/app-doc/root-docs/files/root-docs-6.00.01-fillpatterns.patch
deleted file mode 100644
index e48a4f775..000000000
--- a/app-doc/root-docs/files/root-docs-6.00.01-fillpatterns.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/core/base/doc/macros/fillpatterns.C b/core/base/doc/macros/fillpatterns.C
-index b0a5132..fca81c8 100644
---- a/core/base/doc/macros/fillpatterns.C
-+++ b/core/base/doc/macros/fillpatterns.C
-@@ -20,11 +20,11 @@ TCanvas * fillpatterns()
-
- // Fixed patterns.
- for (i=1; i<=5; i++) {
-- box(j++, 0.01, y-bh, 0.19, y);
-- box(j++, 0.21, y-bh, 0.39, y);
-- box(j++, 0.41, y-bh, 0.59, y);
-- box(j++, 0.61, y-bh, 0.79, y);
-- box(j++, 0.81, y-bh, 0.99, y);
-+ box(j, 0.01, y-bh, 0.19, y); j++;
-+ box(j, 0.21, y-bh, 0.39, y); j++;
-+ box(j, 0.41, y-bh, 0.59, y); j++;
-+ box(j, 0.61, y-bh, 0.79, y); j++;
-+ box(j, 0.81, y-bh, 0.99, y); j++;
- y = y-bh-db;
- }
-
-@@ -55,7 +55,7 @@ TCanvas * fillpatterns()
- return Pat;
- }
-
--box(Int_t pat, Double_t x1, Double_t y1, Double_t x2, Double_t y2)
-+void box(Int_t pat, Double_t x1, Double_t y1, Double_t x2, Double_t y2)
- {
- // Draw an box using the fill pattern "pat" with the "pat" value
- // written on top.
diff --git a/app-doc/root-docs/files/root-docs-6.02.05-jsroot.patch b/app-doc/root-docs/files/root-docs-6.02.05-jsroot.patch
new file mode 100644
index 000000000..1ea170e84
--- /dev/null
+++ b/app-doc/root-docs/files/root-docs-6.02.05-jsroot.patch
@@ -0,0 +1,11 @@
+--- root-6.02.05/documentation/JSROOT/JSROOT.md.orig 2015-02-09 11:59:47.000000000 +0300
++++ root-6.02.05/documentation/JSROOT/JSROOT.md 2015-04-05 19:13:24.010358387 +0300
+@@ -198,7 +198,7 @@
+ <div id="drawing">loading...</div>
+ </body>
+
+-Internally, the JSROOT.loadScript(urllist, callback, debug) method is used. It can be useful when some other scripts should be loaded as well. __urllist__ is a string with scripts names, separated by ';' symbol. If a script name starts with __$$$__ (triple dollar sign), the script will be loaded from a location relative to the main JSROOT directory.
++Internally, the JSROOT.loadScript(urllist, callback, debug) method is used. It can be useful when some other scripts should be loaded as well. __urllist__ is a string with scripts names, separated by ';' symbol. If a script name starts with __\$\$\$__ (triple dollar sign), the script will be loaded from a location relative to the main JSROOT directory.
+ This location is automatically detected when JSRootCore.js script is loaded.
+
+