summaryrefslogtreecommitdiffstats
path: root/scilab/Version.incl
AgeCommit message (Collapse)AuthorFilesLines
2012-04-12Rename branch after mergeVincent COUVERT1-1/+1
Change-Id: I169416967eec43b2f3735ab1814f0a926456dae9
2011-10-21Merge remote-tracking branch 'origin/master' into graphicVincent COUVERT1-1/+1
Conflicts: scilab/CHANGES_5.4.X scilab/Version.incl scilab/configure scilab/modules/core/src/java/org/scilab/modules/core/Scilab.java scilab/modules/gui/Makefile.in scilab/modules/gui/src/c/gui.vcxproj scilab/modules/gui/src/c/gui.vcxproj.filters scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/messagebox/SwingScilabMessageBox.java scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/tab/SwingScilabTab.java scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/window/SwingScilabWindow.java scilab/modules/gui/src/java/org/scilab/modules/gui/helpbrowser/ScilabHelpBrowser.java scilab/modules/gui/src/java/org/scilab/modules/gui/messagebox/ScilabModalDialog.java scilab/modules/gui/src/java/org/scilab/modules/gui/tab/ScilabTab.java scilab/modules/gui/src/java/org/scilab/modules/gui/tab/ScilabTabBridge.java scilab/modules/gui/src/java/org/scilab/modules/gui/tab/SimpleTab.java scilab/modules/gui/src/java/org/scilab/modules/gui/tab/Tab.java scilab/modules/gui/src/java/org/scilab/modules/gui/utils/BarUpdater.java scilab/modules/gui/src/java/org/scilab/modules/gui/utils/SciDockingListener.java scilab/modules/gui/src/java/org/scilab/modules/gui/utils/SciUndockingAction.java scilab/modules/gui/src/jni/CallScilabBridge.giws.xml scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/CommandHistory.java scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/SciNotes.java scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/ExitAction.java scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/NavigatorWindow.java scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/SearchFile.java scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/ScilabVariableBrowser.java scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/SwingScilabVariableBrowser.java scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/VariableBrowser.java scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/SwingScilabVariableEditor.java Change-Id: I8091c22f13fef9955c76864f8d17d6680af0abe8
2011-06-22Change branch nameVincent COUVERT1-1/+1
Change-Id: I3e8d3e3530cd4d5938bb2b74eccee6bd7280cd89
2010-10-05Change version nameVincent COUVERT1-1/+1
Change minor version number from 5.3 to 5.4 Change-Id: I68f0a160c764bc3230a9259ddff5db1d864986df
2010-09-24Change the version name: master -> 5.3Pierre MARECHAL1-1/+1
Change-Id: I2b3a48945400bd6675e0bcad652f056287caf6c6
2010-02-16version on masterAllan CORNET1-1/+1
2009-10-14 mergeSerge Steer1-1/+1
2009-10-06Right versionSylvestre Ledru1-1/+2
2009-09-23Version namePierre MARECHAL1-1/+1
2009-09-07Merge Xpad => master : manage version filesPierre MARECHAL1-1/+1
2009-07-22Version NamePierre MARECHAL1-1/+1
2009-02-24Merge commit 'origin/master' into scicosBruno JOFRET1-1/+1
Conflicts: scilab/Version.incl scilab/modules/core/includes/version.h
2009-02-19Fix version namePierre MARECHAL1-1/+1
2009-01-13MergePierre MARECHAL1-1/+1
2009-01-13Branch NamePierre MARECHAL1-2/+1
2008-10-22SVN => GITPierre MARECHAL1-1/+1
2008-10-22SVN => GITSylvestre Ledru1-1/+1
2006-06-05Change the version name for the trunk versionPierre Marechal1-1/+1
2006-05-09scilab-4.0-CVS replaced by scilab-4.0-SVNPierre Marechal1-1/+1
2006-02-16Update for 4.0 versionPierre Marechal1-1/+1
2005-12-21Update for the 4.0-rc1 versionPierre Marechal1-1/+1
2005-05-27Update for the 3.1 versionPierre Marechal1-1/+1
2005-04-04Update for the 3.1-rc1 versionPierre Marechal1-1/+1
2004-07-09version post 3.0 CVSAllan Cornet1-1/+1
2004-07-06Passage a Scilab 3.0Allan Cornet1-2/+1
2004-05-17Passage a RC1Allan Cornet1-1/+1
2004-04-152.7 -> 3.0Vincent Couvert1-1/+1
2003-11-03to tag CVS versionSerge Steer1-1/+2
2010-07-02Change branch nameVincent COUVERT1-1/+1
Change-Id: Ic585bca1370cea9757cfb20230e108a29cfbb547
2003-01-28passage a la 2.7Serge Steer1-1/+1
2002-10-25updateJean-philippe Chancelier1-1/+2
2002-10-15updateJean-philippe Chancelier1-1/+1
2002-07-12merge version educ natSerge Steer1-1/+1
2001-04-26Initial revisionScilab1-0/+1