OSDN Git Service

Merge branch 'master' into develop
authordhrname <dhrname@users.sourceforge.jp>
Fri, 30 Aug 2013 12:43:47 +0000 (21:43 +0900)
committerdhrname <dhrname@users.sourceforge.jp>
Fri, 30 Aug 2013 12:43:47 +0000 (21:43 +0900)
commit10f87f89ab60ecee2953d82ffbcc97a7a5de7d29
treef594e1d1f87bb8145a7df861613fcf68e34bac42
parent99d4106504727ca72cd170f1945ce98d53f141be
parent891d4922ae0b9bb70eed4aad0574b408069380e9
Merge branch 'master' into develop

Conflicts:
ChangeLog.txt
30 files changed:
ChangeLog.txt
document/Readme.html
document/SieReader.html
document/home.svg
document/htaccess.txt
document/instyle.css
document/mplussample.html
document/rdf.svg
document/releasenote/n20111201.html
document/releasenote/n20111213.html
document/screenshot.html
document/sie-logo.svg
document/sieb.html
document/svg_sample/4wd.svg
document/svg_sample/illustlogo.svg
document/svg_sample/index.svg
document/svg_sample/mplus1cblack.svg
document/svg_sample/svgMplus.svg
document/svg_sample/tisa.svg
document/ufltimatest.html
sie.js.gz
tool/Spec/SpecRunner.html
tool/Spec/lib/jasmine-1.0.1/MIT.LICENSE
tool/Spec/lib/jasmine-1.0.1/jasmine-html.js
tool/Spec/lib/jasmine-1.0.1/jasmine.css
tool/Spec/lib/jasmine-1.0.1/jasmine.js
tool/inlinesvg/svginhtml.js
tool/sie_php/.htaccess
tool/sie_php/readme.html
tool/sie_php/sie.php