summaryrefslogtreecommitdiffstats
path: root/scilab/modules/tclsci
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-22 11:56:39 +0100
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-22 11:56:39 +0100
commit163a7906bea21a424f94b8643beb1ac6a20aeb60 (patch)
tree5088f0d5b19122fd3f5ee58813ea111e7a956275 /scilab/modules/tclsci
parentc6ce5230290b5edaeca9aaa95bd866510df3b3c6 (diff)
parentb910e072ae7f53378f8c073d371df1d42ad533cf (diff)
downloadscilab-163a7906bea21a424f94b8643beb1ac6a20aeb60.zip
scilab-163a7906bea21a424f94b8643beb1ac6a20aeb60.tar.gz
Merge remote branch 'origin/5.2'
Conflicts: scilab/CHANGES_5.2.X scilab/configure scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/Category.java
Diffstat (limited to 'scilab/modules/tclsci')
-rw-r--r--scilab/modules/tclsci/Makefile.in15
1 files changed, 7 insertions, 8 deletions
diff --git a/scilab/modules/tclsci/Makefile.in b/scilab/modules/tclsci/Makefile.in
index a1e77d4..b934885 100644
--- a/scilab/modules/tclsci/Makefile.in
+++ b/scilab/modules/tclsci/Makefile.in
@@ -114,14 +114,13 @@ libscitclsci_la_DEPENDENCIES = $(top_builddir)/modules/action_binding/libsciacti
114 $(top_builddir)/libs/MALLOC/libscimalloc.la \ 114 $(top_builddir)/libs/MALLOC/libscimalloc.la \
115 $(top_builddir)/modules/output_stream/libscioutput_stream.la 115 $(top_builddir)/modules/output_stream/libscioutput_stream.la
116am__libscitclsci_la_SOURCES_DIST = src/notclsci/notclsci.c \ 116am__libscitclsci_la_SOURCES_DIST = src/notclsci/notclsci.c \
117 src/c/TCL_Global.c src/c/InitTclTk.c \ 117 src/c/TCL_Global.c src/c/InitTclTk.c src/c/ScilabEval.c \
118 src/c/ScilabEval.c src/c/setenvtcl.c src/c/InitializeTclTk.c \ 118 src/c/setenvtcl.c src/c/InitializeTclTk.c \
119 src/c/TerminateTclTk.c src/c/setvar.c \ 119 src/c/TerminateTclTk.c src/c/setvar.c src/c/TCL_ArrayDim.c \
120 src/c/TCL_ArrayDim.c src/c/TCL_ArrayExist.c \ 120 src/c/TCL_ArrayExist.c src/c/TCL_ArrayGetVar.c \
121 src/c/TCL_ArrayGetVar.c src/c/TCL_ArraySize.c \ 121 src/c/TCL_ArraySize.c src/c/TCL_Command.c \
122 src/c/TCL_Command.c src/c/GlobalTclInterp.c \ 122 src/c/GlobalTclInterp.c src/c/TCL_getErrorLine.c \
123 src/c/TCL_getErrorLine.c sci_gateway/c/sci_opentk.c \ 123 sci_gateway/c/sci_opentk.c sci_gateway/c/sci_TCL_SetVar.c \
124 sci_gateway/c/sci_TCL_SetVar.c \
125 sci_gateway/c/sci_TCL_ExistVar.c \ 124 sci_gateway/c/sci_TCL_ExistVar.c \
126 sci_gateway/c/sci_TCL_DoOneEvent.c \ 125 sci_gateway/c/sci_TCL_DoOneEvent.c \
127 sci_gateway/c/sci_TCL_UnsetVar.c \ 126 sci_gateway/c/sci_TCL_UnsetVar.c \