← Back to branch summary

~a-mari/xibo/client-qt

~a-mari/xibo/client-qt

Viewing all changes in revision 334.

Committer: Dan Garner
Date: 2014-07-15 15:58:16 UTC
mfrom: (332.2.2 client-161)
Revision ID: dan@xibo.org.uk-20140715155816-laan8uab3sj90uml

Merged lp:~dangarner/xibo/client-161

files added:
client/dotNET/KeyStore.cs

files modified:
client/dotNET/MainForm.cs

client/dotNET/OptionForm.Designer.cs

client/dotNET/OptionForm.cs

client/dotNET/Properties/Settings.Designer.cs

client/dotNET/Properties/Settings.settings

client/dotNET/XiboClient.csproj

client/dotNET/app.config

Show diffs side-by-side

added added

removed removed

client/dotNET/KeyStore.cs

client/dotNET/MainForm.cs

client/dotNET/OptionForm.Designer.cs

client/dotNET/OptionForm.cs

client/dotNET/Properties/Settings.Designer.cs

client/dotNET/Properties/Settings.settings

client/dotNET/XiboClient.csproj

client/dotNET/app.config

Older »