Re : [FALCON] Problems merging tool-api-changes to falcons develop branch

2014-11-23 Thread Frédéric THOMAS
What error do you have ? --- Message initial --- De : "Christofer Dutz" Envoyé : 23 novembre 2014 13:14 A : dev@flex.apache.org Objet : [FALCON] Problems merging tool-api-changes to falcons develop branch Hi, I just updated my scripts to use the released version of the flex-to

[FALCON] Problems merging tool-api-changes to falcons develop branch

2014-11-23 Thread Christofer Dutz
Hi, I just updated my scripts to use the released version of the flex-tool-api and wanted to merge my changes (and some changes to falcon) to the develop branch. I always had this output when doing a build: Ant build completed with 5 errors and 44 warnings in 19s at 23.11.14 13:10 So I sort