IDE: High-DPI: some missing component icons. Removing Merge conflict revision 55324 #7252c9bfd0.

git-svn-id: branches/fixes_1_8@55382 -
This commit is contained in:
michl 2017-06-20 19:40:29 +00:00
parent bc1b8985ad
commit 65e23c9ff6
10 changed files with 10 additions and 0 deletions

6
.gitattributes vendored
View File

@ -6563,6 +6563,8 @@ images/components/tbitbtn.png -text svneol=unset#image/png
images/components/tbitbtn_150.png -text
images/components/tbitbtn_200.png -text
images/components/tbufdataset.png -text svneol=unset#image/png
images/components/tbufdataset_150.png -text
images/components/tbufdataset_200.png -text
images/components/tbutton.png -text svneol=unset#image/png
images/components/tbutton_150.png -text
images/components/tbutton_200.png -text
@ -6722,6 +6724,8 @@ images/components/tmemo.png -text svneol=unset#image/png
images/components/tmemo_150.png -text
images/components/tmemo_200.png -text
images/components/tmouse.png -text svneol=unset#image/png
images/components/tmouse_150.png -text
images/components/tmouse_200.png -text
images/components/tnotebook.png -text svneol=unset#image/png
images/components/topendialog.png -text svneol=unset#image/png
images/components/topendialog_150.png -text
@ -6738,6 +6742,8 @@ images/components/tpairsplitter.png -text svneol=unset#image/png
images/components/tpanel.png -text svneol=unset#image/png
images/components/tpicture.png -text svneol=unset#image/png
images/components/tpopupmenu.png -text svneol=unset#image/png
images/components/tpopupmenu_150.png -text
images/components/tpopupmenu_200.png -text
images/components/tpopupnotifier.png -text svneol=unset#image/png
images/components/tprintdialog_150.png -text
images/components/tprintersetupdialog_150.png -text

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 286 B

After

Width:  |  Height:  |  Size: 259 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 316 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 377 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 523 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 570 B

Binary file not shown.

View File

@ -12,6 +12,8 @@ components/tbitbtn.png
components/tbitbtn_150.png
components/tbitbtn_200.png
components/tbufdataset.png
components/tbufdataset_150.png
components/tbufdataset_200.png
components/tbutton.png
components/tbutton_150.png
components/tbutton_200.png
@ -171,6 +173,8 @@ components/tmemo.png
components/tmemo_150.png
components/tmemo_200.png
components/tmouse.png
components/tmouse_150.png
components/tmouse_200.png
components/tnotebook.png
components/topendialog.png
components/topendialog_150.png