summaryrefslogtreecommitdiff
path: root/rhino/makefile.mk
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-03-22 09:26:26 +0100
committerJan Holesovsky <kendy@suse.cz>2011-03-22 09:26:26 +0100
commit0c5d43ac09a57f67003c9a714dd3caf0b438625c (patch)
tree3e817601c43eb2814705f78394da0faa8d78b576 /rhino/makefile.mk
parent03022d302c4a9e7e543de3388d5a68a43c95a689 (diff)
parentb59eaea542c154ed0b1d4677b20547c892e5e123 (diff)
Merge commit 'ooo/DEV300_m103'
Diffstat (limited to 'rhino/makefile.mk')
-rwxr-xr-xrhino/makefile.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/rhino/makefile.mk b/rhino/makefile.mk
index 9f42ca2c8f83..094e1102ad2f 100755
--- a/rhino/makefile.mk
+++ b/rhino/makefile.mk
@@ -46,7 +46,8 @@ ADDITIONAL_FILES= \
toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java
PATCH_FILES=rhino1_5R5.patch \
- rhino1_5R5-find_swing.patch
+ rhino1_5R5-find_swing.patch \
+ rhino1_5R5-updateToolTip.patch
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=