-
Thibault Normand authored
#SVN MERGE 621464 Conflict solving due to merge in umbrello/umbrello/CMakelist.txt svn path=/branches/work/isi-umbrello/umbrello/; revision=622468
92865884
#SVN MERGE 621464 Conflict solving due to merge in umbrello/umbrello/CMakelist.txt svn path=/branches/work/isi-umbrello/umbrello/; revision=622468