Merge lp://staging/~dangarner/xibo/client-170-alpha2 into lp://staging/xibo/1.7
Proposed by
Dan Garner
| Status: | Merged | ||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 346 | ||||||||||||||||||||||||
| Proposed branch: | lp://staging/~dangarner/xibo/client-170-alpha2 | ||||||||||||||||||||||||
| Merge into: | lp://staging/xibo/1.7 | ||||||||||||||||||||||||
| Diff against target: |
1291 lines (+337/-382) 20 files modified
client/dotNET/Forms/OptionForm.cs (+1/-1) client/dotNET/Log/ClientInfo.Designer.cs (+33/-27) client/dotNET/Log/ClientInfo.cs (+8/-2) client/dotNET/Log/ClientInfo.resx (+21/-18) client/dotNET/Log/StatLog.cs (+63/-125) client/dotNET/Logic/ApplicationSettings.cs (+2/-2) client/dotNET/Logic/RequiredFiles.cs (+3/-3) client/dotNET/Logic/ScheduleManager.cs (+41/-33) client/dotNET/Logic/ScreenShot.cs (+1/-0) client/dotNET/Media/CefWebMedia.cs (+69/-40) client/dotNET/Media/IeWebMedia.cs (+70/-41) client/dotNET/Media/ShellCommand.cs (+5/-1) client/dotNET/Media/TemporaryFile.cs (+0/-71) client/dotNET/Web References/xmds/Reference.cs (+10/-8) client/dotNET/Web References/xmds/Reference.map (+1/-1) client/dotNET/Web References/xmds/xmds.wsdl (+4/-3) client/dotNET/XiboClient.csproj (+2/-3) client/dotNET/XmdsAgents/FileAgent.cs (+1/-1) client/dotNET/XmdsAgents/RegisterAgent.cs (+1/-1) client/dotNET/default.config.xml (+1/-1) |
||||||||||||||||||||||||
| To merge this branch: | bzr merge lp://staging/~dangarner/xibo/client-170-alpha2 | ||||||||||||||||||||||||
| 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
