commit b4658b4be1d9b36e3b943af9aae154066d482182
author Tim Buschtöns <tbuschto@eclipsesource.com> Wed Dec 04 10:08:05 2013 +0100
committer Tim Buschtöns <tbuschto@eclipsesource.com> Wed Dec 04 10:08:05 2013 +0100
tree ae9a84243fae3944351917916fb21940312ca68b
parent 304572d38a063e5849170365a6a030961da2bf38
parent a4d54dfb906d51274f83dd5d4b7e5fbc289c43b4

Merge branch 'master' of
ssh://tbuschto@git.eclipse.org/gitroot/rap/org.eclipse.rap.tools.git

Conflicts:
	bundles/org.eclipse.rap.doc/guide/articles/scripting.html

bundles/org.eclipse.rap.doc/guide/articles/scripting.html

diff --git a/bundles/org.eclipse.rap.doc/guide/articles/scripting.html b/bundles/org.eclipse.rap.doc/guide/articles/scripting.html
index 25f31c4..8e51fc9 100644
--- a/bundles/org.eclipse.rap.doc/guide/articles/scripting.html
+++ b/bundles/org.eclipse.rap.doc/guide/articles/scripting.html
@@ -69,7 +69,7 @@
     If your script is longer than a few lines, we recommend to read it from an external file.
     You may want to create a helper class to do so. It could look like this:
   </p>
-  <pre class="lang-java">public class ResourceLoaderUtil {
+  <pre class="lang-java" style="height:150px;overflow:scroll">public class ResourceLoaderUtil {
 
   private static final ClassLoader CLASSLOADER = ResourceLoaderUtil.class.getClassLoader();