summaryrefslogtreecommitdiffstats
path: root/scilab/Scilab_f2c.sln
diff options
context:
space:
mode:
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>2012-10-25 14:42:40 +0200
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>2012-10-26 11:19:48 +0200
commitdb44dd24f0cacb133aaf48956cf410997cc25e72 (patch)
tree479c06161ec0a768365d849910a67b0337968cac /scilab/Scilab_f2c.sln
parentf4202b278ce50d05a8f2ed7bf328611ff4c31f95 (diff)
parentb1e98ec8877b6fbf51574533b51a4eb0fbf8f043 (diff)
downloadscilab-db44dd24f0cacb133aaf48956cf410997cc25e72.zip
scilab-db44dd24f0cacb133aaf48956cf410997cc25e72.tar.gz
Merge remote-tracking branch 'origin/master' into YaSp
Conflicts: scilab/Scilab_f2c.sln scilab/modules/api_scilab/Makefile.am scilab/modules/api_scilab/Makefile.in scilab/modules/core/includes/version.h.in scilab/modules/core/includes/version.h.vc scilab/modules/core/src/c/callDynamicGateway.c scilab/modules/core/src/c/stack2.c scilab/modules/graphics/core_Import.def scilab/modules/graphics/includes/gw_graphics.h scilab/modules/graphics/sci_gateway/c/gw_graphics.c scilab/modules/graphics/sci_gateway/c/sci_clear_pixmap.c scilab/modules/graphics/sci_gateway/c/sci_rotate_axes.c scilab/modules/graphics/sci_gateway/c/sci_show_pixmap.c scilab/modules/graphics/sci_gateway/c/sci_winsid.c scilab/modules/graphics/src/c/StringMatrix.c scilab/modules/graphics/src/c/getHandleProperty/get_auto_ticks_property.c scilab/modules/graphics/src/c/getHandleProperty/get_axes_reverse_property.c scilab/modules/graphics/src/c/getHandleProperty/setGetHashTable.c scilab/modules/gui/sci_gateway/c/sci_ClipBoard.c scilab/modules/gui/sci_gateway/c/sci_helpbrowser.c scilab/modules/gui/sci_gateway/c/sci_uimenu.c scilab/modules/gui/sci_gateway/cpp/sci_about.cpp scilab/modules/gui/sci_gateway/cpp/sci_displaytree.cpp scilab/modules/gui/sci_gateway/cpp/sci_fire_closing_finished.cpp scilab/modules/gui/src/cpp/displaytree.cpp scilab/modules/hdf5/sci_gateway/cpp/sci_export_to_hdf5.cpp scilab/modules/hdf5/src/cpp/listvar_in_hdf5_v1.cpp scilab/modules/special_functions/Makefile.am scilab/modules/special_functions/Makefile.in scilab/modules/special_functions/sci_gateway/c/sci_dlgamma.c scilab/modules/special_functions/sci_gateway/c/sci_gamma.c scilab/modules/special_functions/sci_gateway/c/sci_lgamma.c scilab/modules/spreadsheet/Makefile.am scilab/modules/spreadsheet/Makefile.in scilab/modules/spreadsheet/sci_gateway/c/sci_csvDefault.c scilab/modules/spreadsheet/sci_gateway/c/sci_csvIsnum.c scilab/modules/spreadsheet/sci_gateway/c/sci_csvRead.c scilab/modules/spreadsheet/sci_gateway/c/sci_csvStringToDouble.c scilab/modules/spreadsheet/sci_gateway/c/sci_csvTextScan.c scilab/modules/spreadsheet/sci_gateway/c/sci_csvWrite.c scilab/modules/spreadsheet/sci_gateway/cpp/gw_csv_tools.h scilab/modules/spreadsheet/spreadsheet.vcxproj scilab/modules/spreadsheet/spreadsheet.vcxproj.filters scilab/modules/spreadsheet/src/c/csvDefault.c scilab/modules/spreadsheet/src/c/csv_strsubst.c scilab/modules/umfpack/sci_gateway/c/sci_umf_luget.c scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalGenerateIcon.cpp Change-Id: I8719eb508d13aa6e545eb348bdd918f68c6e916e
Diffstat (limited to 'scilab/Scilab_f2c.sln')
-rw-r--r--scilab/Scilab_f2c.sln26
1 files changed, 26 insertions, 0 deletions
diff --git a/scilab/Scilab_f2c.sln b/scilab/Scilab_f2c.sln
index 843fa00..d141156 100644
--- a/scilab/Scilab_f2c.sln
+++ b/scilab/Scilab_f2c.sln
@@ -1819,6 +1819,32 @@ Global
1819 {CE49C183-2ECE-4EA4-B289-D74E2E664164}.Release|Win32.Build.0 = Release|Win32 1819 {CE49C183-2ECE-4EA4-B289-D74E2E664164}.Release|Win32.Build.0 = Release|Win32
1820 {CE49C183-2ECE-4EA4-B289-D74E2E664164}.Release|x64.ActiveCfg = Release|x64 1820 {CE49C183-2ECE-4EA4-B289-D74E2E664164}.Release|x64.ActiveCfg = Release|x64
1821 {CE49C183-2ECE-4EA4-B289-D74E2E664164}.Release|x64.Build.0 = Release|x64 1821 {CE49C183-2ECE-4EA4-B289-D74E2E664164}.Release|x64.Build.0 = Release|x64
1822 {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Debug|Win32.ActiveCfg = Debug|Win32
1823 {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Debug|x64.ActiveCfg = Debug|x64
1824 {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Debug|x64.Build.0 = Debug|x64
1825 {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Release|Win32.ActiveCfg = Release|Win32
1826 {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Release|x64.ActiveCfg = Release|x64
1827 {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Release|x64.Build.0 = Release|x64
1828 {A9A2020D-5541-44F2-B080-DF3C9426C409}.Debug|Win32.ActiveCfg = Debug|Win32
1829 {A9A2020D-5541-44F2-B080-DF3C9426C409}.Debug|Win32.Build.0 = Debug|Win32
1830 {A9A2020D-5541-44F2-B080-DF3C9426C409}.Debug|x64.ActiveCfg = Debug|x64
1831 {A9A2020D-5541-44F2-B080-DF3C9426C409}.Debug|x64.Build.0 = Debug|x64
1832 {A9A2020D-5541-44F2-B080-DF3C9426C409}.Release|Win32.ActiveCfg = Release|Win32
1833 {A9A2020D-5541-44F2-B080-DF3C9426C409}.Release|Win32.Build.0 = Release|Win32
1834 {A9A2020D-5541-44F2-B080-DF3C9426C409}.Release|x64.ActiveCfg = Release|x64
1835 {A9A2020D-5541-44F2-B080-DF3C9426C409}.Release|x64.Build.0 = Release|x64
1836 {85303A11-CF6B-432F-B3FD-24DEFFB51025}.Debug|Win32.ActiveCfg = Debug|Win32
1837 {85303A11-CF6B-432F-B3FD-24DEFFB51025}.Debug|x64.ActiveCfg = Debug|x64
1838 {85303A11-CF6B-432F-B3FD-24DEFFB51025}.Release|Win32.ActiveCfg = Release|Win32
1839 {85303A11-CF6B-432F-B3FD-24DEFFB51025}.Release|x64.ActiveCfg = Release|x64
1840 {88E95224-A931-4B3E-AC6C-5A40B3961421}.Debug|Win32.ActiveCfg = Debug|Win32
1841 {88E95224-A931-4B3E-AC6C-5A40B3961421}.Debug|x64.ActiveCfg = Debug|x64
1842 {88E95224-A931-4B3E-AC6C-5A40B3961421}.Release|Win32.ActiveCfg = Release|Win32
1843 {88E95224-A931-4B3E-AC6C-5A40B3961421}.Release|x64.ActiveCfg = Release|x64
1844 {439D04EC-A444-48BE-8E55-8CD2BB66B782}.Debug|Win32.ActiveCfg = Debug|Win32
1845 {439D04EC-A444-48BE-8E55-8CD2BB66B782}.Debug|x64.ActiveCfg = Debug|x64
1846 {439D04EC-A444-48BE-8E55-8CD2BB66B782}.Release|Win32.ActiveCfg = Release|Win32
1847 {439D04EC-A444-48BE-8E55-8CD2BB66B782}.Release|x64.ActiveCfg = Release|x64
1822 {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Debug|Win32.ActiveCfg = Debug|Win32 1848 {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Debug|Win32.ActiveCfg = Debug|Win32
1823 {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Debug|Win32.Build.0 = Debug|Win32 1849 {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Debug|Win32.Build.0 = Debug|Win32
1824 {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Debug|x64.ActiveCfg = Debug|x64 1850 {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Debug|x64.ActiveCfg = Debug|x64