Merge remote-tracking branch 'origin/develop' into develop

Project: http://git-wip-us.apache.org/repos/asf/flex-blazeds/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-blazeds/commit/a6a313f4
Tree: http://git-wip-us.apache.org/repos/asf/flex-blazeds/tree/a6a313f4
Diff: http://git-wip-us.apache.org/repos/asf/flex-blazeds/diff/a6a313f4

Branch: refs/heads/develop
Commit: a6a313f4e6dc7028cb52593506906fbe32e86324
Parents: 2034617 43f1b95
Author: Christofer Dutz <[email protected]>
Authored: Sun Mar 13 18:18:54 2016 +0100
Committer: Christofer Dutz <[email protected]>
Committed: Sun Mar 13 18:18:54 2016 +0100

----------------------------------------------------------------------
 .gitignore         |   5 +-
 build.properties   |  24 +++--
 build.xml          | 138 +++++++++++--------------
 common/build.xml   |   6 +-
 core/build.xml     |  24 +++--
 downloads.xml      | 265 ++++++++++++++++++------------------------------
 opt/build.xml      |  79 +++++----------
 proxy/build.xml    |  12 +--
 remoting/build.xml |   8 +-
 sdk/build.xml      |   4 +-
 10 files changed, 229 insertions(+), 336 deletions(-)
----------------------------------------------------------------------


Reply via email to