Merge lp://staging/~dangarner/xibo/client-141 into lp://staging/~xibo-maintainers/xibo/d-arrest
Proposed by
Dan Garner
| Status: | Merged | ||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 262 | ||||||||||||||||||||||||
| Proposed branch: | lp://staging/~dangarner/xibo/client-141 | ||||||||||||||||||||||||
| Merge into: | lp://staging/~xibo-maintainers/xibo/d-arrest | ||||||||||||||||||||||||
| Diff against target: |
678 lines (+223/-79) 13 files modified
client/dotNET/MainForm.cs (+40/-3) client/dotNET/OptionForm.Designer.cs (+46/-18) client/dotNET/OptionForm.cs (+2/-0) client/dotNET/Properties/Settings.Designer.cs (+13/-1) client/dotNET/Properties/Settings.settings (+4/-1) client/dotNET/Region.cs (+2/-0) client/dotNET/Resources/HtmlTemplate.htm (+24/-16) client/dotNET/Rss.cs (+45/-31) client/dotNET/Text.cs (+7/-4) client/dotNET/Video.cs (+4/-1) client/dotNET/WebContent.cs (+20/-3) client/dotNET/XiboClient.csproj (+12/-0) client/dotNET/app.config (+4/-1) |
||||||||||||||||||||||||
| To merge this branch: | bzr merge lp://staging/~dangarner/xibo/client-141 | ||||||||||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Xibo Maintainters | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
