diff options
author | Armin Le Grand <alg@apache.org> | 2013-04-11 13:08:10 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2013-05-20 11:33:12 +0100 |
commit | 6c50995593dadc2eeb7ee319b4de12a104e2c4d5 (patch) | |
tree | e2f670394a57212dc0e9fccc8c45c006996068b1 /.gitattributes | |
parent | 02e5e18bb46956d743faf21f62066b56f6cedf7e (diff) |
Related: #i121791# Corrected names for LineDashes, cleaned up resources
(cherry picked from commit ef75cc7bf6ceb6ecf5f2fb32dd560ef05303f1f2)
Conflicts:
icon-themes/galaxy/svx/res/symphony/style_line1.png
icon-themes/galaxy/svx/res/symphony/style_line10.png
icon-themes/galaxy/svx/res/symphony/style_line11.png
icon-themes/galaxy/svx/res/symphony/style_line2.png
icon-themes/galaxy/svx/res/symphony/style_line3.png
icon-themes/galaxy/svx/res/symphony/style_line4.png
icon-themes/galaxy/svx/res/symphony/style_line5.png
icon-themes/galaxy/svx/res/symphony/style_line6.png
icon-themes/galaxy/svx/res/symphony/style_line7.png
icon-themes/galaxy/svx/res/symphony/style_line8.png
icon-themes/galaxy/svx/res/symphony/style_line9.png
icon-themes/hicontrast/svx/res/symphony/style_line1.png
icon-themes/hicontrast/svx/res/symphony/style_line10.png
icon-themes/hicontrast/svx/res/symphony/style_line11.png
icon-themes/hicontrast/svx/res/symphony/style_line2.png
icon-themes/hicontrast/svx/res/symphony/style_line3.png
icon-themes/hicontrast/svx/res/symphony/style_line4.png
icon-themes/hicontrast/svx/res/symphony/style_line5.png
icon-themes/hicontrast/svx/res/symphony/style_line6.png
icon-themes/hicontrast/svx/res/symphony/style_line7.png
icon-themes/hicontrast/svx/res/symphony/style_line8.png
icon-themes/hicontrast/svx/res/symphony/style_line9.png
Change-Id: Iccb0c2b6b1870806d05ee02569b7fdf1f96405c2
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions