Op 2-7-2012 22:30, Uwe Stöhr schreef:
"-DLYX_MERGE_FILES=0" used on branch, "-DLYX_MERGE_FILES=1" used in trunk.Yes, I do. Peter once proposed to do so. I forgot in the meantime why he preferred this. Could you tell me why the code compiled in non-merge mode and not in merge? I want to avoid such cases in the future. If necessary I will also compile my branches in merge mode.
Just do not use the merge files ever when you're developing. Vincent
