summaryrefslogtreecommitdiffstats
path: root/scilab/modules/graphics
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2010-03-26 09:02:19 +0100
committerPierre MARECHAL <pierre.marechal@scilab.org>2010-03-26 09:02:19 +0100
commit37ef78c160828c9443fb70d592d3037646c66a3c (patch)
treed1abb2853882b6c57af5a6905791ab4d6d6eaf22 /scilab/modules/graphics
parent406aca9869ecf8bf7bfebd74e3a5e541d5fe0ff7 (diff)
parent9e8af24c153583b960a1b2728360f4abc4b0107d (diff)
downloadscilab-37ef78c160828c9443fb70d592d3037646c66a3c.zip
scilab-37ef78c160828c9443fb70d592d3037646c66a3c.tar.gz
Merge commit 'origin/5.2'
Conflicts: scilab/etc/classpath.xml.vc scilab/modules/graphics/graphics.iss
Diffstat (limited to 'scilab/modules/graphics')
-rw-r--r--scilab/modules/graphics/graphics.iss4
1 files changed, 2 insertions, 2 deletions
diff --git a/scilab/modules/graphics/graphics.iss b/scilab/modules/graphics/graphics.iss
index bea03c7..a1fb4b8 100644
--- a/scilab/modules/graphics/graphics.iss
+++ b/scilab/modules/graphics/graphics.iss
@@ -15,8 +15,8 @@ Source: modules\{#GRAPHICS}\readme.txt; DestDir: {app}\modules\{#GRAPHICS}; Comp
15Source: modules\{#GRAPHICS}\license.txt; DestDir: {app}\modules\{#GRAPHICS}; Components: {#COMPN_GRAPHICS} 15Source: modules\{#GRAPHICS}\license.txt; DestDir: {app}\modules\{#GRAPHICS}; Components: {#COMPN_GRAPHICS}
16Source: modules\{#GRAPHICS}\changelog.txt; DestDir: {app}\modules\{#GRAPHICS}; Components: {#COMPN_GRAPHICS} 16Source: modules\{#GRAPHICS}\changelog.txt; DestDir: {app}\modules\{#GRAPHICS}; Components: {#COMPN_GRAPHICS}
17; 17;
18Source: thirdparty\jlatexmath-0.8.9.jar;DestDir: {app}\thirdparty; Components: {#COMPN_GRAPHICS} 18Source: thirdparty\jlatexmath-0.9.1.jar;DestDir: {app}\thirdparty; Components: {#COMPN_GRAPHICS}
19Source: thirdparty\jlatexmath-fop-0.8.9.jar;DestDir: {app}\thirdparty; Components: {#COMPN_GRAPHICS} 19Source: thirdparty\jlatexmath-fop-0.9.1.jar;DestDir: {app}\thirdparty; Components: {#COMPN_GRAPHICS}
20; 20;
21Source: bin\graphics.dll; DestDir: {app}\bin; Components: {#COMPN_GRAPHICS} 21Source: bin\graphics.dll; DestDir: {app}\bin; Components: {#COMPN_GRAPHICS}
22; 22;