preload

Information

The changes are displayed in the unified format. New lines are highlighted in green, while deleted lines are red. All other lines are unchanged and can be used for orientation.


--- /tt/168/  (revision  2, 2010-12-20 18:26:24) (view)
+++ /tt/168/  (revision  3, 2010-12-20 20:02:19) (view)

@@ -1,17 +1,12 @@
 
Courses
 
------------------------
-
- Long name:   Conflict
-
  Short name:  Conflict
-
  Start:       0
-
  Color:       #C00000 / #C00000
-
-
- Long name:   Data Modelling<br >and Databases
+
- Long name:   Data Modelling and Databases
 
  Short name:  DMDB
 
  Start:       15
 
  Color:       #C2D69A / #E3EFCB
 
-
- Long name:   Formal Methods and<br >Functional Programming 
+
- Long name:   Formal Methods and Functional Programming
 
  Short name:  FMFP
 
  Start:       15
 
  Color:       #8DB4E3 / #C5D9F1
 

@@ -19,9 +14,9 @@
 
  Short name:  InfSec
 
  Start:       15
 
  Color:       #B2A1C7 / #D9D0E5
 
-
- Long name:   Operating Systems<br >and Networks
+
- Long name:   Operating Systems and Networks
 
  Short name:  OSaN
 
  Start:       15
 
  Color:       #9AC2B8 / #CCDDD9
 

@@ -60,20 +55,20 @@
 
    Start:     15
 
    Length:    45
 
    Exercise:  No
 
-
  - Course:    Conflict
+
  - Course:    InfSec
+
    Room:      CAB G61
 
    Room:      
-
    Room:      
-
    Start:     0
-
    Length:    60
+
    Start:     15
+
    Length:    45
 
    Exercise:  No
 
-
  - Course:    Conflict
+
  - Course:    InfSec
+
    Room:      CAB G61
 
    Room:      
-
    Room:      
-
    Start:     0
-
    Length:    60
+
    Start:     15
+
    Length:    45
 
    Exercise:  No
 
 
  - Course:    SoftArch
 
    Room:      

@@ -167,21 +162,21 @@
 
    Start:     15
 
    Length:    45
 
    Exercise:  Yes
 
-
  - Course:    Conflict
+
  - Course:    InfSec
 
    Room:      
 
    Room:      
-
    Start:     0
-
    Length:    60
-
    Exercise:  No
+
    Start:     15
+
    Length:    45
+
    Exercise:  Yes
 
-
  - Course:    Conflict
+
  - Course:    FMFP
 
    Room:      
 
    Room:      
-
    Start:     0
-
    Length:    60
-
    Exercise:  No
+
    Start:     15
+
    Length:    45
+
    Exercise:  Yes
 
 
  - Course:    InfSec
 
    Room:      
 
    Room:      

@@ -224,28 +219,28 @@
 
    Start:     15
 
    Length:    45
 
    Exercise:  No
 
-
  - Course:    Conflict
-
    Room:      
-
    Room:      
-
    Start:     0
-
    Length:    60
+
  - Course:    InfSec
+
    Room:      CAB G61
+
    Room:      CAB G61
+
    Start:     15
+
    Length:    45
 
    Exercise:  No
 
-
  - Course:    Conflict
-
    Room:      
-
    Room:      
-
    Start:     0
-
    Length:    60
-
    Exercise:  No
+
  - Course:    InfSec
+
    Room:      CAB G61
+
    Room:      CAB G61
+
    Start:     15
+
    Length:    45
+
    Exercise:  Yes
 
-
  - Course:    Conflict
-
    Room:      
-
    Room:      
-
    Start:     0
-
    Length:    60
-
    Exercise:  No
+
  - Course:    InfSec
+
    Room:      CAB G61
+
    Room:      CAB G61
+
    Start:     15
+
    Length:    45
+
    Exercise:  Yes
 
 
  - Course:    InfSec
 
    Room:      
 
    Room: