summaryrefslogtreecommitdiffstats
path: root/scilab/modules/scicos
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2010-04-01 15:39:39 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2010-04-01 15:39:39 +0200
commit3168c176002bcbb9431db4ae720caa114592721a (patch)
tree6036858845a8e29924106cb9833d71e38cb15545 /scilab/modules/scicos
parent61e84f25e6f62f7b7ee6e593b07b496f9a0b592d (diff)
parent3d8f7fcc07395efe2269081a92ce748592df7996 (diff)
downloadscilab-3168c176002bcbb9431db4ae720caa114592721a.zip
scilab-3168c176002bcbb9431db4ae720caa114592721a.tar.gz
Merge commit 'origin/5.2'
Conflicts: scilab/configure
Diffstat (limited to 'scilab/modules/scicos')
-rw-r--r--scilab/modules/scicos/Makefile.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/scilab/modules/scicos/Makefile.in b/scilab/modules/scicos/Makefile.in
index f104299..7605743 100644
--- a/scilab/modules/scicos/Makefile.in
+++ b/scilab/modules/scicos/Makefile.in
@@ -1,4 +1,4 @@
1# Makefile.in generated by automake 1.11 from Makefile.am. 1# Makefile.in generated by automake 1.11.1 from Makefile.am.
2# @configure_input@ 2# @configure_input@
3 3
4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,