summaryrefslogtreecommitdiffstats
path: root/scilab/modules/Makefile.am
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2010-04-14 10:44:21 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2010-04-14 10:44:21 +0200
commitd5ec130218f86ced2e72096ab24feeafa14373dd (patch)
treeff59bffb70de4544f946ea33965648d39893cfcd /scilab/modules/Makefile.am
parent735d3e217f1a1b3eb62bc5dbdefb7d9693226954 (diff)
parent033309380f01622698f2ea0cf744cf6cc72250db (diff)
downloadscilab-d5ec130218f86ced2e72096ab24feeafa14373dd.zip
scilab-d5ec130218f86ced2e72096ab24feeafa14373dd.tar.gz
Merge commit 'origin/5.2'
Conflicts: scilab/modules/functions/tests/unit_tests/getf.tst Change-Id: Ic209624ec52e0615fce1f02c08a387aea90b8ded
Diffstat (limited to 'scilab/modules/Makefile.am')
-rw-r--r--scilab/modules/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index 9d887f9..9647c96 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -34,8 +34,8 @@ shell \
34completion \ 34completion \
35console \ 35console \
36graphic_export \ 36graphic_export \
37jvm \
38gui \ 37gui \
38jvm \
39graphics \ 39graphics \
40optimization \ 40optimization \
41symbolic \ 41symbolic \