diff options
| author | Alex-TIMEHACK <[email protected]> | 2017-05-19 21:51:48 +0100 |
|---|---|---|
| committer | Alex-TIMEHACK <[email protected]> | 2017-05-19 21:51:48 +0100 |
| commit | 43647f873b9c2cd454b0b9389b952e1b36406725 (patch) | |
| tree | c41de99a6103ad72dd449481d1153da3e1114c8b /TimeHACK.Main/Properties/Resources.resx | |
| parent | 044d3dd3aa38f02693d1d2561a4276b2dc1bdd9a (diff) | |
| parent | d9fa6d11aa4889ba4538b00ef56d03da78664025 (diff) | |
| download | histacom2-43647f873b9c2cd454b0b9389b952e1b36406725.tar.gz histacom2-43647f873b9c2cd454b0b9389b952e1b36406725.tar.bz2 histacom2-43647f873b9c2cd454b0b9389b952e1b36406725.zip | |
Fixed Conflicts
Diffstat (limited to 'TimeHACK.Main/Properties/Resources.resx')
| -rw-r--r-- | TimeHACK.Main/Properties/Resources.resx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/TimeHACK.Main/Properties/Resources.resx b/TimeHACK.Main/Properties/Resources.resx index 453d8f1..8eaea12 100644 --- a/TimeHACK.Main/Properties/Resources.resx +++ b/TimeHACK.Main/Properties/Resources.resx @@ -350,5 +350,7 @@ </data> <data name="WinClassicGENERALApplicationToolbarBackground" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\WinClassic\WinClassicGENERALApplicationToolbarBackground.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="WinClassicTaskbarItem" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\resources\winclassic\winclassictaskbaritem.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> </root>
\ No newline at end of file |