[MERGE FAILED] use filelist install method for udkapi and offapi

2013-04-05 Thread Fridrich Strba (via Code Review)
Fridrich Strba has submitted this change and it FAILED to merge. Change subject: use filelist install method for udkapi and offapi .. Your change could not be merged due to a path conflict. Please merge (or rebase) the change l

[MERGE FAILED] use filelist install method for udkapi and offapi

2013-04-05 Thread Fridrich Strba (via Code Review)
Fridrich Strba has submitted this change and it FAILED to merge. Change subject: use filelist install method for udkapi and offapi .. Your change could not be merged due to a path conflict. Please merge (or rebase) the change l