visitor branch merged into master

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

visitor branch merged into master

kintel
Administrator
Hi all,

Just FYI: I've merged the visitor branch into master. This may cause issues for people having forked the master and have pending changes.
The old master branch has been tagged "old-master".

 -Marius


Reply | Threaded
Open this post in threaded view
|

Re: visitor branch merged into master

Brad Pitcher
Did you get it backwards? The commit logs shows only one tiny change.
https://github.com/openscad/openscad/commit/610d7508d99c5da1754a1d40127fe7743e3cb81e


On Tue, Sep 27, 2011 at 2:04 PM, Marius Kintel <[hidden email]> wrote:
Hi all,

Just FYI: I've merged the visitor branch into master. This may cause issues for people having forked the master and have pending changes.
The old master branch has been tagged "old-master".

 -Marius

_______________________________________________
OpenSCAD mailing list
[hidden email]
http://rocklinux.net/mailman/listinfo/openscad

Reply | Threaded
Open this post in threaded view
|

Re: visitor branch merged into master

kintel
Administrator
On Sep 27, 2011, at 23:33 PM, Brad Pitcher wrote:

> Did you get it backwards? The commit logs shows only one tiny change.
> https://github.com/openscad/openscad/commit/610d7508d99c5da1754a1d40127fe7743e3cb81e
>
No, that was just a minor merge I did before merging visitor into master. Since master was already a subset of visitor, there wasn't a large merge. All commits show up when they were made - I admit that this is less than informative for people following development.

 -Marius