Differences

This shows you the differences between two versions of the page.

--- software:start [2013/05/15 11:32] – created dreger
+++ software:start [2013/05/15 12:44] (current) – [Table] dreger
@@ Line 1: / Line 1: @@
 ====== Software at the FU Physics department ======
-Software products for which no central licensing is available can usually be obtained from ZEDAT. See their price list at [[http://www.zedat.fu-berlin.de/Benutzerservice/Software]] for further information.
+Software products for which no central licensing is available can usually be obtained from ZEDAT. See their price list at [[http://www.zedat.fu-berlin.de/Benutzerservice/Software]].
+The following software products have been centrally licensed at the Physics department. Click on the product name for further information.
+^ Product                                                                         ^ Vendor                ^ eligible users            ^ home-use  ^ paid by                    ^
+| [[https://wiki.physik.fu-berlin.de/it/software:msdnaa:start|msdn-aa]]           | Microsoft             | everyone                  | yes       | IT-service                 |
+| [[https://wiki.physik.fu-berlin.de/it/software:mathematica:start|Mathematica]]  | Wolfram Research      | everyone                  | yes       | IT-service and workgroups  |
+| [[https://wiki.physik.fu-berlin.de/it/software:matlab:start|MATLAB]]            | MathWorks             | everyone                  | no        | IT-service                 |
+| [[https://wiki.physik.fu-berlin.de/it/software:labview:start|LabView]]          | National Instruments  | participating workgroups  | yes       | workgroups                 |
+| [[https://wiki.physik.fu-berlin.de/it/software:origin:start|Origin]]            | OriginLab             | everyone                  | yes       | workgroups                 |
+| [[https://wiki.physik.fu-berlin.de/it/software:solidworks:start|SolidWorks]]    | SolidWorks            | participating workgroups  | no        | workgroups                 |
-The following software products have been centrally licensed. Click on the product name for fu
-^ Vendor    ^ Product ^ eligible users ^ home-use ^ paid by ^
-| Microsoft | MSDN-AA | everyone | yes | IT-service |
-| Wolfram Research | [[https://wiki.physik.fu-berlin.de/it/software:mathematica:start|Mathematica]] | everyone | yes | IT-service and workgroups |
-| MathWorks | [[https://wiki.physik.fu-berlin.de/it/software:matlab:start|MATLAB]] | everyone | no | IT-service |
-| National Instruments | LabView | participating workgroups | ? | workgroups |
-| OriginLab | Origin | everyone | yes | workgroups |
-| SolidWorks | SolidWorks | participating workgroups | no | workgroups |