------------------------------------------------------------------------

Blocked revision 47766 #78b5f45688 from fixes_1_4
r47766 | zeljko | 2015-02-14 09:42:58 +0100 (Sub, 14 Vel 2015) | 2 lines

Qt: fixed merging conflict in r47732 #4821baf49f

------------------------------------------------------------------------

git-svn-id: branches/fixes_1_4@47767 -
This commit is contained in:
zeljko 2015-02-14 08:45:11 +00:00
parent 78b5f45688
commit d38695ff12

Diff Content Not Available