When I was cherry picking my commits, I accidentally included two additional ones.. You can revert those changes to master (except for the one correcting the README).
Now -- with the refactoring / as3httpd work I'm doing -- I have made substantial changes to the develop branch. Changes that will be difficult to merge (the main mxml went from 3,800 lines of code to about 400, with everything else going to additional modules / as3 classes). I had no idea that you were still working on stuff over the weekend because nothing has really been committed.... So... No idea how we plan on handling that... -Nick On Tue, Feb 10, 2015 at 1:59 PM, OmPrakash Muppirala <[email protected]> wrote: > Aren't we supposed to check in code into the develop branch and not the > master branch? > > Thanks, > Om > > On Tue, Feb 10, 2015 at 8:46 AM, Neil Madsen <[email protected] > > > wrote: > > > > > Hi Nick, > > > > I noticed all of the additions I have made to the installer are now gone. > > Ie. Back button > > There are other fixes that are now gone as well that dealt with the > license > > checkboxes and user selected languages and how they are stored/retrieved. > > > > Can you revert this and use the latest from the repo to make your > changes? > > Thanks > > > > Neil > > > > > > > > -----Original Message----- > > From: [email protected] [mailto:[email protected]] > > Sent: February-09-15 9:22 PM > > To: [email protected] > > Subject: [2/4] git commit: [flex-utilities] [refs/heads/master] - Removed > > dead code and unused imports. > > > > Removed dead code and unused imports. > > > > > > Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo > > Commit: > > http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/d1951a32 > > Tree: > http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/d1951a32 > > Diff: > http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/d1951a32 > > > > Branch: refs/heads/master > > Commit: d1951a32b68d20fbd742e7b819fbd56e46daef14 > > Parents: a92816a > > Author: quetwo <[email protected]> > > Authored: Fri Feb 6 15:31:55 2015 -0500 > > Committer: quetwo <[email protected]> > > Committed: Fri Feb 6 15:31:55 2015 -0500 > > > > ---------------------------------------------------------------------- > > installer/src/InstallApacheFlex.mxml | 6466 > +++++++++++++++-------------- > > 1 file changed, 3346 insertions(+), 3120 deletions(-) > > ---------------------------------------------------------------------- > > > > > > > > >
