Merge lp://staging/~dangarner/xibo/server-122 into lp://staging/xibo/1.3
Proposed by
Dan Garner
Status: | Merged |
---|---|
Merged at revision: | 212 |
Proposed branch: | lp://staging/~dangarner/xibo/server-122 |
Merge into: | lp://staging/xibo/1.3 |
Diff against target: |
1943 lines (+1071/-176) (has conflicts) 27 files modified
client/dotNET/CacheManager.cs (+75/-1) client/dotNET/FileCollector.cs (+60/-27) client/dotNET/MainForm.cs (+45/-22) client/dotNET/Properties/Settings.Designer.cs (+13/-1) client/dotNET/Properties/Settings.settings (+4/-1) client/dotNET/Region.cs (+11/-1) client/dotNET/RequiredFiles.cs (+206/-0) client/dotNET/Schedule.cs (+1/-1) client/dotNET/ScheduleManager.cs (+16/-1) client/dotNET/Web References/xmds/Reference.cs (+67/-0) client/dotNET/Web References/xmds/xmds.wsdl (+23/-0) client/dotNET/XiboClient.csproj (+1/-0) client/dotNET/app.config (+4/-1) client/dotNET/bin/Release/XiboClient.exe.config (+24/-3) client/dotNET/bin/Release/XiboClient.vshost.exe.config (+24/-3) client/python/XiboClient.py (+4/-0) server/install/database/27.sql (+9/-0) server/lib/app/kit.class.php (+3/-0) server/lib/data/display.data.class.php (+134/-29) server/lib/data/schedule.data.class.php (+5/-0) server/lib/include.php (+3/-3) server/lib/pages/display.class.php (+244/-81) server/lib/pages/layout.class.php (+6/-0) server/lib/pages/region.class.php (+5/-0) server/lib/service/service.wsdl (+23/-0) server/lib/service/xmdssoap.class.php (+60/-0) server/modules/module_db_mysql.php (+1/-1) Text conflict in client/dotNET/FileCollector.cs Text conflict in client/dotNET/Region.cs Text conflict in client/python/XiboClient.py Text conflict in server/lib/app/kit.class.php Text conflict in server/lib/data/display.data.class.php Text conflict in server/lib/pages/display.class.php |
To merge this branch: | bzr merge lp://staging/~dangarner/xibo/server-122 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Xibo Maintainters | Pending | ||
Review via email:
|
To post a comment you must log in.