You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jo...@apache.org on 2016/07/15 22:35:15 UTC

[1/2] git commit: [flex-asjs] [refs/heads/develop] - asdoc-config.xml: accounted for Language project

Repository: flex-asjs
Updated Branches:
  refs/heads/develop 9bd493735 -> 4f8dfe88e


asdoc-config.xml: accounted for Language project


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

Branch: refs/heads/develop
Commit: 1774c7d598376d571b8157c8151ff7669e840801
Parents: f590e91
Author: Josh Tynjala <jo...@apache.org>
Authored: Fri Jul 15 15:34:57 2016 -0700
Committer: Josh Tynjala <jo...@apache.org>
Committed: Fri Jul 15 15:34:57 2016 -0700

----------------------------------------------------------------------
 frameworks/asdoc-config.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1774c7d5/frameworks/asdoc-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/asdoc-config.xml b/frameworks/asdoc-config.xml
index 5f696b0..3dd96e6 100644
--- a/frameworks/asdoc-config.xml
+++ b/frameworks/asdoc-config.xml
@@ -65,6 +65,7 @@
           <path-element>${frameworks_dir}/projects/HTML/src/main/flex</path-element>
           <path-element>${frameworks_dir}/projects/HTML5/src/main/flex</path-element>
           <path-element>${frameworks_dir}/projects/JQuery/src/main/flex</path-element>
+          <path-element>${frameworks_dir}/projects/Language/src/main/flex</path-element>
           <path-element>${frameworks_dir}/projects/Mobile/src/main/flex</path-element>
           <path-element>${frameworks_dir}/projects/Network/src/main/flex</path-element>
           <path-element>${frameworks_dir}/projects/Reflection/src/main/flex</path-element>
@@ -430,7 +431,7 @@
     </exclude-classes>
    
    <exclude-sources>
-       <path-element>${frameworks_dir}/projects/Core/src/main/flex/org/apache/flex/utils/Language.as</path-element>
+       <path-element>${frameworks_dir}/projects/Language/src/main/flex/org/apache/flex/utils/Language.as</path-element>
        <path-element>${frameworks_dir}/projects/Core/src/main/flex/org/apache/flex/core/WrappedHTMLElement.as</path-element>
        <path-element>${frameworks_dir}/projects/Core/src/main/flex/org/apache/flex/events/BrowserEvent.as</path-element>
        <path-element>${frameworks_dir}/projects/Core/src/main/flex/org/apache/flex/core/IFlexJSElement.as</path-element>


[2/2] git commit: [flex-asjs] [refs/heads/develop] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop

Posted by jo...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop


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

Branch: refs/heads/develop
Commit: 4f8dfe88e1362e8c5e4663a57a9d615ec1c7e4bc
Parents: 1774c7d 9bd4937
Author: Josh Tynjala <jo...@apache.org>
Authored: Fri Jul 15 15:35:08 2016 -0700
Committer: Josh Tynjala <jo...@apache.org>
Committed: Fri Jul 15 15:35:08 2016 -0700

----------------------------------------------------------------------
 distribution/pom.xml            | 13 +++++++++++++
 examples/flexjs/pom.xml         |  6 ++++++
 frameworks/projects/XML/pom.xml | 13 +++++++++++++
 frameworks/projects/pom.xml     |  1 +
 4 files changed, 33 insertions(+)
----------------------------------------------------------------------