Update trunk to the non-release-related minor changes in stable/branch 2.7
git-svn-id: http://svg-edit.googlecode.com/svn/trunk@2758 eee81c28-f429-11dd-99c0-75d572ba1dddmaster
parent
5cbd05c8bd
commit
bdb81d541c
6
Makefile
6
Makefile
|
@ -1,5 +1,5 @@
|
|||
NAME=svg-edit
|
||||
VERSION=2.6
|
||||
VERSION=2.7
|
||||
PACKAGE=$(NAME)-$(VERSION)
|
||||
MAKEDOCS=naturaldocs/NaturalDocs
|
||||
CLOSURE=build/tools/closure-compiler.jar
|
||||
|
@ -25,8 +25,8 @@ JS_FILES=\
|
|||
path.js \
|
||||
svgcanvas.js \
|
||||
svg-editor.js \
|
||||
contextmenu.js \
|
||||
locale/locale.js
|
||||
locale/locale.js \
|
||||
contextmenu.js
|
||||
|
||||
JS_INPUT_FILES=$(addprefix editor/, $(JS_FILES))
|
||||
JS_BUILD_FILES=$(addprefix build/$(PACKAGE)/, $(JS_FILES))
|
||||
|
|
|
@ -74,7 +74,7 @@ var svgEditor = (function($, editor) {'use strict';
|
|||
ui = langData.ui;
|
||||
|
||||
setStrings('content', {
|
||||
copyrightLabel: misc.powered_by,
|
||||
// copyrightLabel: misc.powered_by, // Currently commented out in svg-editor.html
|
||||
curve_segments: properties.curve_segments,
|
||||
fitToContent: tools.fitToContent,
|
||||
fit_to_all: tools.fit_to_all,
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
<link rel="stylesheet" href="spinbtn/JQuerySpinBtn.css" type="text/css"/>
|
||||
|
||||
<!--{if jquery_release}>
|
||||
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.js"></script>
|
||||
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
|
||||
<!{else}-->
|
||||
<script src="jquery.js"></script>
|
||||
<!--{endif}-->
|
||||
|
|
Loading…
Reference in New Issue