Skip to content
This repository has been archived by the owner on Jan 29, 2018. It is now read-only.

Emblaser videosources #177

Merged
merged 4 commits into from
Nov 9, 2016
Merged

Emblaser videosources #177

merged 4 commits into from
Nov 9, 2016

Conversation

copet80
Copy link

@copet80 copet80 commented Nov 6, 2016

No description provided.

@krolco krolco merged commit 71683dd into emblaser Nov 9, 2016
@ghost
Copy link

ghost commented Nov 9, 2016

As a sidenote, how much of the emblaser branch can make its way to master?

@krolco
Copy link
Contributor

krolco commented Nov 9, 2016

Some of it, but it will require a bit of care: right now it only works as an app, requires python (because the app packager requires that), and has a few emblaser-specific features in-dev. For changes that aren't emblaser-specific, I have been doing them on master and merging them to emblaser so that master benefits also.

@ghost
Copy link

ghost commented Nov 9, 2016

Ok cool (: now i am happy since i know the plan there. Keep up the way you
do then (:

On Nov 9, 2016 6:59 PM, "Monte Krol" notifications@github.com wrote:

Some of it, but it will require a bit of care: right now it only works as
an app, requires python (because the app packager requires that), and has a
few emblaser-specific features in-dev. For changes that aren't
emblaser-specific, I have been doing them on master and merging them to
emblaser so that master benefits also.


You are receiving this because you commented.
Reply to this email directly, view it on GitHub
#177 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AHVr27y8bvxm5hcrqW7XLGRQyFPpuzWfks5q8fvdgaJpZM4KqgqD
.

@krolco
Copy link
Contributor

krolco commented Nov 9, 2016

I think pretty much everyone except Anthony and I should be working on master; I don't think anybody else is working on emblaser-specific stuff. I didn't look into the camera stuff yet; that might be a good candidate for a merge back to master.

@ghost
Copy link

ghost commented Nov 9, 2016

The packaged app might be useful too. But we need to start thinking if
that works for packing LaserWeb4 too. I see @tbfleming is making amazingly
fast progress on that

On Nov 9, 2016 7:16 PM, "Monte Krol" notifications@github.com wrote:

I think pretty much everyone except Anthony and I should be working on
master; I don't think anybody else is working on emblaser-specific stuff. I
didn't look into the camera stuff yet; that might be a good candidate for a
merge back to master.


You are receiving this because you commented.
Reply to this email directly, view it on GitHub
#177 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AHVr22hNXeEL2ce5ORfrggoO4H7i8-pUks5q8gABgaJpZM4KqgqD
.

@krolco krolco deleted the emblaser-videosources branch November 19, 2016 04:04
@copet80 copet80 restored the emblaser-videosources branch December 28, 2016 21:33
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants