Skip to content
This repository has been archived by the owner on May 28, 2022. It is now read-only.

Justin TV finalized pull request #321

Merged
merged 38 commits into from
Apr 7, 2013
Merged

Conversation

nkait
Copy link

@nkait nkait commented Apr 6, 2013

Rebased against latest experimental

mib and others added 30 commits April 6, 2013 14:31
All the UI pieces necessary for supporting presets
for specific RTMP output destinations (such as justin.tv)
are now in place.
Setting justin.tv in freeseer-config now overwrites
custom settings. An apply button was added to make
the configuration change transparent.
Commit originally authored by Michael Bejda
Jakub Adamek and others added 8 commits April 6, 2013 15:14
This commit allows plugins config to shrink if their
contents shrink. This change does not break any plugins'
current appearance, but is beneficial to an improved UI
for rtmp-settings.
@@ -2,8 +2,8 @@
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please don't include resource_rc.py in pull requests. This file is auto generated and will cause merge conflicts.

zxiiro added a commit that referenced this pull request Apr 7, 2013
@zxiiro zxiiro merged commit ed64b41 into Freeseer:experimental Apr 7, 2013
@dideler dideler mentioned this pull request Aug 30, 2014
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