Merge lp://qastaging/~dangarner/xibo/client-140rc1 into lp://qastaging/~xibo-maintainers/xibo/d-arrest
Proposed by
Dan Garner
| Status: | Merged |
|---|---|
| Merged at revision: | 252 |
| Proposed branch: | lp://qastaging/~dangarner/xibo/client-140rc1 |
| Merge into: | lp://qastaging/~xibo-maintainers/xibo/d-arrest |
| Diff against target: |
2395 lines (+835/-456) 29 files modified
client/dotNET/CacheManager.cs (+142/-123) client/dotNET/DataSetView.cs (+0/-1) client/dotNET/Flash.cs (+0/-1) client/dotNET/HardwareKey.cs (+55/-40) client/dotNET/Log/ClientInfo.cs (+1/-1) client/dotNET/MainForm.cs (+15/-16) client/dotNET/Media.cs (+20/-8) client/dotNET/MediaOption.cs (+15/-12) client/dotNET/OptionForm.Designer.cs (+33/-10) client/dotNET/OptionForm.cs (+3/-1) client/dotNET/Program.cs (+16/-24) client/dotNET/Properties/Resources.Designer.cs (+1/-1) client/dotNET/Properties/Settings.Designer.cs (+25/-1) client/dotNET/Properties/Settings.settings (+7/-1) client/dotNET/Region.cs (+119/-71) client/dotNET/RequiredFiles.cs (+92/-62) client/dotNET/Rss.cs (+1/-2) client/dotNET/ScheduleManager.cs (+32/-25) client/dotNET/ShellCommand.cs (+7/-1) client/dotNET/Text.cs (+2/-2) client/dotNET/Video.cs (+35/-20) client/dotNET/VideoDS.cs (+139/-0) client/dotNET/VideoPlayer.cs (+25/-0) client/dotNET/Web References/xmds/Reference.cs (+23/-23) client/dotNET/WebContent.cs (+15/-7) client/dotNET/XiboClient.csproj (+3/-0) client/dotNET/XmdsAgents/RequiredFilesAgent.cs (+1/-1) client/dotNET/XmdsAgents/ScheduleAgent.cs (+1/-1) client/dotNET/app.config (+7/-1) |
| To merge this branch: | bzr merge lp://qastaging/~dangarner/xibo/client-140rc1 |
| 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
