ControlSystemStudio/cs-studio — pull request #460 by kasemir (2014-04-09 13:10:12+00:00)
Title: Update BOY Example version

Fixes #459. Also updates the message to mention the versions in
conflict.