Skip to content
Commit 859c0ca3 authored by Michal Batko's avatar Michal Batko
Browse files

Merge branch 'devel' of ssh://mufin.fi.muni.cz/messif.git into devel 

Conflicts:
	messif/utility/CoreApplication.java
parents 3e8889b5 672de71c
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment