[Pcgen-trackers] [JIRA] Resolved: (CODE-525) Merging CDOM branch with a new branch off trunk

[JIRA (f. J. D. ) <ji...@pc...>]

     [ http://jira.pcgen.org/browse/CODE-525?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

James Dempsey resolved CODE-525.
--------------------------------

    Resolution: Complete

> Merging CDOM branch with a new branch off trunk
> -----------------------------------------------
>
>                 Key: CODE-525
>                 URL: http://jira.pcgen.org/browse/CODE-525
>             Project: Code
>          Issue Type: New Feature
>          Components: Architecture, UI
>         Environment: new branch sandbox/uisync
>            Reporter: James Dempsey
>            Assignee: James Dempsey
>            Priority: Major
>             Fix For: CDOM UI Build 1
>
>
> Create a branch from the current trunk code and merge in the work done in the cdom branch. With this manual merge done in the branch, then an automatic SVN merge can be used to apply the new UI to the trunk once it has been tested and covers the major use cases.

-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: http://jira.pcgen.org/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira