[25/50] [abbrv] git commit: [flex-asjs] [refs/heads/feature/amf] - Made the text values of Tables consistant. Fixed merging when span is after a table. These changes should be back-ported to the origi

2017-07-31 Thread piotrz
Made the text values of Tables consistant. Fixed merging when span is after a table. These changes should be back-ported to the original TLF as well. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/397cfc19 Tree: http

[12/13] git commit: [flex-asjs] [refs/heads/feature/browser-event] - Made the text values of Tables consistant. Fixed merging when span is after a table. These changes should be back-ported to the ori

2017-07-25 Thread harbs
Made the text values of Tables consistant. Fixed merging when span is after a table. These changes should be back-ported to the original TLF as well. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/397cfc19 Tree: http

git commit: [flex-asjs] [refs/heads/develop] - Made the text values of Tables consistant. Fixed merging when span is after a table. These changes should be back-ported to the original TLF as well.

2017-07-25 Thread harbs
Repository: flex-asjs Updated Branches: refs/heads/develop 4eb3eaf38 -> 397cfc19b Made the text values of Tables consistant. Fixed merging when span is after a table. These changes should be back-ported to the original TLF as well. Project: http://git-wip-us.apache.org/repos/asf/flex-a

[02/50] git commit: [flex-asjs] [refs/heads/master] - Merging

2016-09-07 Thread aharui
Merging Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a94a9230 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a94a9230 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a94a9230 Branch: refs

[03/50] [abbrv] git commit: [flex-asjs] [refs/heads/spark] - Merging

2016-08-25 Thread aharui
Merging Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a94a9230 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a94a9230 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a94a9230 Branch: refs

[6/6] git commit: [flex-asjs] [refs/heads/refactor-sprite] - Merging transform changes into refactor-sprite

2016-08-02 Thread yishayw
Merging transform changes into refactor-sprite Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/5cd2f76a Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/5cd2f76a Diff: http://git-wip-us.apache.org/repos/asf

[02/10] git commit: [flex-asjs] [refs/heads/develop] - Merging

2016-07-31 Thread yishayw
Merging Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a94a9230 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a94a9230 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a94a9230 Branch: refs

[2/7] git commit: [flex-asjs] [refs/heads/refactor-sprite] - Merging

2016-07-28 Thread harbs
Merging Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a94a9230 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a94a9230 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a94a9230 Branch: refs

[2/2] git commit: [flex-asjs] [refs/heads/svg-rename] - Merging

2016-07-28 Thread yishayw
Merging Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a94a9230 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a94a9230 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a94a9230 Branch: refs

git commit: [flex-falcon] [refs/heads/feature/maven-migration-test] - - Made the externs build again after merging in the latest changes.

2016-04-22 Thread cdutz
Repository: flex-falcon Updated Branches: refs/heads/feature/maven-migration-test 6bd222bd2 -> 28f5f13c9 - Made the externs build again after merging in the latest changes. Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/f

[2/2] git commit: [flex-falcon] [refs/heads/feature/maven-migration-test] - - Made the externs build again after merging in the latest changes.

2016-04-22 Thread cdutz
- Made the externs build again after merging in the latest changes. Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/6bd222bd Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/6bd222bd Diff: http://git

Merging

2015-12-14 Thread Alex Harui
Hi, I think flex-asjs has never had the master branch updated, so I am going to do that shortly. Apologies in advance for the tons of commits emails that I think will ensue. We are also almost ready to merge the back port branch into develop. Probably not today, but I hope early this week.

[5/6] git commit: [flex-falcon] - fix a few issues after merging Erik's changes

2013-04-19 Thread aharui
fix a few issues after merging Erik's changes Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/123afb75 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/123afb75 Diff: http://git-wip-us.apache.org