summaryrefslogtreecommitdiffstats
path: root/scilab/modules/Makefile.am
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2009-10-08 11:43:54 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2009-10-08 11:43:54 +0200
commit065dba6a0d44c2111e57e3f2cfca0ec21b0a25cc (patch)
tree99240a3d0878eaf146282f82d0c46dd6477782d8 /scilab/modules/Makefile.am
parent49be97c171c4e7281b53b0d1f5758cb330e3c844 (diff)
parente6bb34a2151dd4e126d51062e2ab389ecbb85439 (diff)
downloadscilab-065dba6a0d44c2111e57e3f2cfca0ec21b0a25cc.zip
scilab-065dba6a0d44c2111e57e3f2cfca0ec21b0a25cc.tar.gz
Merge commit 'origin/master' into Xcos
Conflicts: scilab/Version.incl scilab/configure scilab/modules/Makefile.in scilab/modules/core/includes/version.h
Diffstat (limited to 'scilab/modules/Makefile.am')
-rw-r--r--scilab/modules/Makefile.am1
1 files changed, 0 insertions, 1 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index 86be6b0..94c5514 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -70,7 +70,6 @@ overloading \
70maple2scilab \ 70maple2scilab \
71m2sci \ 71m2sci \
72texmacs \ 72texmacs \
73scipad \
74development_tools \ 73development_tools \
75compatibility_functions \ 74compatibility_functions \
76helptools \ 75helptools \