diff options
| author | Michael <[email protected]> | 2017-06-25 13:46:39 -0400 |
|---|---|---|
| committer | Michael <[email protected]> | 2017-06-25 13:46:39 -0400 |
| commit | 5bebd4411bc6266cbee482a429ba794eefa8f9b6 (patch) | |
| tree | a68282dda40c4f0b28883241c7adcf9010f4550e /ShiftOS.WinForms/Properties/Resources.resx | |
| parent | 8e19c8599975685410d7508b150f811dc3991f4a (diff) | |
| parent | 6f5e69bd9df3bd44c098a179458fd37ca6114685 (diff) | |
| download | shiftos_thereturn-5bebd4411bc6266cbee482a429ba794eefa8f9b6.tar.gz shiftos_thereturn-5bebd4411bc6266cbee482a429ba794eefa8f9b6.tar.bz2 shiftos_thereturn-5bebd4411bc6266cbee482a429ba794eefa8f9b6.zip | |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# ShiftOS.WinForms/ShiftOS.WinForms.csproj
Diffstat (limited to 'ShiftOS.WinForms/Properties/Resources.resx')
| -rw-r--r-- | ShiftOS.WinForms/Properties/Resources.resx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ShiftOS.WinForms/Properties/Resources.resx b/ShiftOS.WinForms/Properties/Resources.resx index d1264e8..1e47fbf 100644 --- a/ShiftOS.WinForms/Properties/Resources.resx +++ b/ShiftOS.WinForms/Properties/Resources.resx @@ -34631,4 +34631,7 @@ <data name="PebcakDevelFS" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\PebcakDevelFS.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value> </data> + <data name="BlueBlueVerticalGradient" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\BlueBlueVerticalGradient.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> </root>
\ No newline at end of file |