diff options
| author | Ted Gould <ted@gould.cx> | 2009-11-29 20:01:26 +0000 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2009-11-29 20:01:26 +0000 |
| commit | 2987ff2ce2f379e14fad4fd17665f3a2472f09fc (patch) | |
| tree | 1f31400a1014478bb0761f0c9e353607ada1ec2b /src | |
| parent | Scour extension update (diff) | |
| parent | Updated version files that were missed. (diff) | |
| download | inkscape-2987ff2ce2f379e14fad4fd17665f3a2472f09fc.tar.gz inkscape-2987ff2ce2f379e14fad4fd17665f3a2472f09fc.zip | |
Merging in the changes from the 0.47 release branch. Also updating version numbers for 0.47 development.
(bzr r8848)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/inkscape.rc | 10 | ||||
| -rw-r--r-- | src/inkview.rc | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 63b27398a..30d1e5f42 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -266,7 +266,7 @@ check_PROGRAMS = cxxtests # List of all tests to be run. TESTS = $(check_PROGRAMS) ../share/extensions/test/run-all-extension-tests -# XFAIL_TESTS = $(check_PROGRAMS) ../share/extensions/test/run-all-extension-tests +XFAIL_TESTS = $(check_PROGRAMS) ../share/extensions/test/run-all-extension-tests # including the the testsuites here ensures that they get distributed cxxtests_SOURCES = cxxtests.cpp libnr/nr-compose-reference.cpp $(CXXTEST_TESTSUITES) diff --git a/src/inkscape.rc b/src/inkscape.rc index d48b68c43..3b946a067 100644 --- a/src/inkscape.rc +++ b/src/inkscape.rc @@ -3,8 +3,8 @@ APPLICATION_ICON ICON DISCARDABLE "../inkscape.ico" 1 24 DISCARDABLE "./inkscape-manifest.xml" 1 VERSIONINFO - FILEVERSION 0,46,0,0 - PRODUCTVERSION 0,46,0,0 + FILEVERSION 0,47,0,0 + PRODUCTVERSION 0,47,0,0 BEGIN BLOCK "StringFileInfo" BEGIN @@ -13,11 +13,11 @@ BEGIN VALUE "Comments", "Published under the GNU GPL" VALUE "CompanyName", "inkscape.org" VALUE "FileDescription", "Inkscape" - VALUE "FileVersion", "0.46.0" + VALUE "FileVersion", "0.47" VALUE "InternalName", "Inkscape" - VALUE "LegalCopyright", "© 2007 Inkscape" + VALUE "LegalCopyright", "© 2009 Inkscape" VALUE "ProductName", "Inkscape" - VALUE "ProductVersion", "0.46.0" + VALUE "ProductVersion", "0.47" END END BLOCK "VarFileInfo" diff --git a/src/inkview.rc b/src/inkview.rc index 9f643eb4c..7a02bf11a 100644 --- a/src/inkview.rc +++ b/src/inkview.rc @@ -3,8 +3,8 @@ APPLICATION_ICON ICON DISCARDABLE "../inkscape.ico" 1 24 DISCARDABLE "./inkview-manifest.xml"
1 VERSIONINFO
- FILEVERSION 0,46,0,0
- PRODUCTVERSION 0,46,0,0
+ FILEVERSION 0,47,0,0
+ PRODUCTVERSION 0,47,0,0
BEGIN
BLOCK "StringFileInfo"
BEGIN
@@ -13,11 +13,11 @@ BEGIN VALUE "Comments", "Published under the GNU GPL"
VALUE "CompanyName", "inkscape.org"
VALUE "FileDescription", "Inkview"
- VALUE "FileVersion", "0.46.0"
+ VALUE "FileVersion", "0.47"
VALUE "InternalName", "Inkview"
- VALUE "LegalCopyright", "© 2007 Inkscape"
+ VALUE "LegalCopyright", "© 2009 Inkscape"
VALUE "ProductName", "Inkview"
- VALUE "ProductVersion", "0.46.0"
+ VALUE "ProductVersion", "0.47"
END
END
BLOCK "VarFileInfo"
|