diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-23 19:47:42 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-23 19:47:42 -0300 |
commit | c4cc142235d7d77327c2a53d9efb2750b1ec80bf (patch) | |
tree | 41446fa0833a3783d24b6bd12c64336f845e6032 /libre/virtualbox-libre/LocalConfig.kmk | |
parent | 5ddafb1e55d18275d3f16e9faa3e9da788b54389 (diff) | |
parent | b1b9debcc7f6756d83dbac37806021de007cf083 (diff) |
Merge branch 'master' of ssh://gparabola/abslibre
Conflicts:
libre/linux-libre/PKGBUILD
Diffstat (limited to 'libre/virtualbox-libre/LocalConfig.kmk')
-rw-r--r-- | libre/virtualbox-libre/LocalConfig.kmk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libre/virtualbox-libre/LocalConfig.kmk b/libre/virtualbox-libre/LocalConfig.kmk index e5cbcebcd..d42cd3e1f 100644 --- a/libre/virtualbox-libre/LocalConfig.kmk +++ b/libre/virtualbox-libre/LocalConfig.kmk @@ -14,6 +14,6 @@ VBOX_WITH_REGISTRATION_REQUEST = VBOX_WITH_UPDATE_REQUEST = VBOX_WITH_VNC := 1 VBOX_BLD_PYTHON = python2 -VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk +VBOX_JAVA_HOME = /usr/lib/jvm/java-7-openjdk VBOX_GCC_WERR = VBOX_GCC_WARN = |