Arthur van Dam

Merged revision(s) 181 from trunk:

Nieuw mapje

........

merged from diff between trees trunk and branch willem
separate add and delete
    • -0
    • +1
    /trunk/documents/testM.txt
real svn move
Merged revision(s) from trunk:

separate delate + add in trunk
    • -0
    • +3
    /trunk/documents/test.txt
again svn move of a file into subfolder
Merged revision(s) from branches/willem:

local aanpassing in branch
Merged revision(s) 159-169 from trunk.

delete and add in two separate steps
    • -0
    • +14
    /trunk/documents/cursus.txt
test delete in branch

    • -90
    • +0
    /branches/stef4/modelA/DM_Sobek.txt
    • -104
    • +0
    /branches/stef4/modelA/mozart.prm
    • -161
    • +0
    /branches/stef4/modelA/state_Ivo.xml
Added several slides+exercices on branching + merging