From: Bdale Garbee Date: Sun, 18 Mar 2012 10:31:06 +0000 (+0100) Subject: Merge commit '46077ef99f953486550547c15bd60dd02bab9241' into upstream X-Git-Tag: upstream/12.03~1 X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=da1c2a7f13fc0e3e84f36981a3bb996f2254f766;p=debian%2Fopenrocket Merge commit '46077ef99f953486550547c15bd60dd02bab9241' into upstream Conflicts: core/lib-extra/RXTXcomm.jar core/lib-test/hamcrest-core-1.3.0RC1.jar core/lib-test/hamcrest-library-1.3.0RC1.jar core/lib-test/jmock-2.6.0-RC2.jar core/lib-test/jmock-junit4-2.6.0-RC2.jar core/lib-test/junit-dep-4.8.2.jar core/lib-test/uispec4j-2.3-jdk16.jar core/lib/iText-5.0.2.jar core/lib/jcommon-1.0.16.jar core/lib/jfreechart-1.0.13.jar core/lib/miglayout15-swing.jar core/web/html/actions/.htaccess core/web/html/actions/reportbug.php core/web/html/actions/testbugreport.html core/web/html/alternative.css core/web/html/border-radius.htc core/web/html/cc-by-nc-nd-80x15.png core/web/html/cc-by-sa-80x15.png core/web/html/documentation.html core/web/html/favicon.ico core/web/html/features.html core/web/html/getinvolved.html core/web/html/icon.png core/web/html/index-manual.html core/web/html/menubg.png core/web/html/project-support.jpg core/web/html/robots.txt core/web/html/screenshots.html core/web/html/shots-small/dialog-analysis.jpg core/web/html/shots-small/dialog-edit.jpg core/web/html/shots-small/dialog-plot-options.jpg core/web/html/shots-small/dialog-plot.jpg core/web/html/shots-small/main.jpg core/web/html/shots/dialog-analysis.png core/web/html/shots/dialog-edit.png core/web/html/shots/dialog-plot-options.png core/web/html/shots/dialog-plot.png core/web/html/shots/main.png core/web/html/starfield.jpg core/web/html/techdoc.pdf core/web/html/thesis.pdf core/web/html/valid-xhtml10.png core/web/html/vcss.gif core/web/html/whitebox-horizontal.png core/web/html/whitebox-vertical.png core/web/html/whitebox.png core/web/htp.rsp core/web/htp/body.htt core/web/htp/documentation.htp core/web/htp/features.htp core/web/htp/getinvolved.htp core/web/htp/index.htp core/web/update-html.sh --- da1c2a7f13fc0e3e84f36981a3bb996f2254f766