Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Tom Morris 2013-03-26 12:53:32 -04:00
commit 7813439dc8

View File

@ -249,6 +249,7 @@
<jarbundler <jarbundler
dir="${mac.dir}" dir="${mac.dir}"
name="OpenRefine" name="OpenRefine"
shortname="Refine"
mainclass="com.google.refine.Refine" mainclass="com.google.refine.Refine"
icon="${graphics.dir}/icon/openrefine.icns" icon="${graphics.dir}/icon/openrefine.icns"
version="${version}" version="${version}"
@ -256,7 +257,7 @@
aboutmenuname="OpenRefine" aboutmenuname="OpenRefine"
workingdirectory="$APP_PACKAGE/Contents/Resources" workingdirectory="$APP_PACKAGE/Contents/Resources"
jvmversion="1.6+" jvmversion="1.6+"
bundleid="com.google.refine.Refine" bundleid="org.openrefine.refine.Refine"
vmoptions="-Xms256M -Xmx1024M -Drefine.version=${revision}" vmoptions="-Xms256M -Xmx1024M -Drefine.version=${revision}"
antialiasedgraphics="true" antialiasedgraphics="true"
antialiasedtext="true" antialiasedtext="true"