summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authoritetcu <itetcu@FreeBSD.org>2006-07-11 20:25:12 +0000
committeritetcu <itetcu@FreeBSD.org>2006-07-11 20:25:12 +0000
commit75742aefe2b92f484fccbcb3675785ebb3781789 (patch)
treeb41785528bab428a7b53941b2db07509cda7b5ea /graphics
parent3dd3e321b7f43a11e7b3d7f3218b85a45d889152 (diff)
downloadFreeBSD-ports-75742aefe2b92f484fccbcb3675785ebb3781789.zip
FreeBSD-ports-75742aefe2b92f484fccbcb3675785ebb3781789.tar.gz
Finish previous interrupted commit.
Update to 1.1.5 PR: ports/100105 Submitted by: maintainer
Diffstat (limited to 'graphics')
-rw-r--r--graphics/jdraw/files/jdraw.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/graphics/jdraw/files/jdraw.in b/graphics/jdraw/files/jdraw.in
index ff618b2..0d8d051 100644
--- a/graphics/jdraw/files/jdraw.in
+++ b/graphics/jdraw/files/jdraw.in
@@ -5,6 +5,7 @@ if [ -z "${JAVA_VERSION}" ]; then
fi
if [ "${JAVA_VERSION}" \> "1.4" ]; then
+>>>>>>> 1.2
LOOK_AND_FEEL="%%PLASTIC3D%%"
else
LOOK_AND_FEEL=
OpenPOWER on IntegriCloud