Skip to content
Snippets Groups Projects
Commit 51c9d784 authored by Jorrit Schaap's avatar Jorrit Schaap
Browse files

SW-32: tried to merge https://svn.astron.nl/LOFAR/branches/SW-26_WinCC into... 

SW-32: tried to merge https://svn.astron.nl/LOFAR/branches/SW-26_WinCC into trunk, but there was too much svn merge hell due. So, ended up merging the branch into trunk using meld manually. Additional fixes on manual merge.
parent 57aff2d5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 1089 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment