Skip to content

Merge Branches of unifying the versions #14

Open

Description

@carlosdelfino

I Made a merge of the Branch to the master so that the master be just as functional outcome and approved to be used to generate the package, the other branchs development will save information rather exposed explicitly when necessary.

Activity

  1. niesteszeck commented on Apr 1, 2013

    @niesteszeck
    Contributor

    What branch did you merge (you mentioned ...a merge of the Branch...)

  2. carlosdelfino commented on Apr 1, 2013

    @carlosdelfino
    ContributorAuthor

    In theory I did the merge of all, but only of what is working.

    Already the Branch DuinOS_V0.6.x I tried to merge in practice, but the directory structure is not equal mainly due to difference in name, so I manually and will not appear on the graph of GIT.

    Thus maintaining the master is as the Branch distribution and should only be changed when the Branch development in the case becomes DuinOS_V0.6.x, when TAGed approved as is applied to the master that the news come to be public and distributed in the package.

    In DuinOS_V0.6.x Branch will adjust the directory so that they are all equal, and I have to submit a new tutorial on how the file will be recreated boot.txt, since this is different for IDE 1.5.xe 1.0.x, thus there are two different methods.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions