Context Navigation

← Previous Change
Next Change →

conflict

Timestamp:

2021-12-15T14:18:46+01:00 (4 years ago)

Author:

stoecker

Message:

remove private path information form SVG files

Location:

trunk/resources/images/dialogs/conflict

Files:

: 18 edited

copyaftercurrentleft.svg (modified) (1 diff)
copyaftercurrentright.svg (modified) (1 diff)
copybeforecurrentleft.svg (modified) (1 diff)
copybeforecurrentright.svg (modified) (1 diff)
copyendleft.svg (modified) (1 diff)
copyendright.svg (modified) (1 diff)
copystartleft.svg (modified) (1 diff)
copystartright.svg (modified) (1 diff)
mergeincomplete.svg (modified) (1 diff)
movedown.svg (modified) (1 diff)
moveup.svg (modified) (1 diff)
remove.svg (modified) (1 diff)
tagconflictunresolved.svg (modified) (1 diff)
tagkeepmine.svg (modified) (1 diff)
tagkeeptheir.svg (modified) (1 diff)
tagundecide.svg (modified) (1 diff)
useallleft.svg (modified) (1 diff)
useallright.svg (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/resources/images/dialogs/conflict/copyaftercurrentleft.svg

r8032	r18329
17	17	sodipodi:docname="copyaftercurrentleft.svg"
18	18	inkscape:output_extension="org.inkscape.output.svg.inkscape"
19		inkscape:export-filename="~~C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\~~copybeforecurrentleft.png"
	19	inkscape:export-filename="copybeforecurrentleft.png"
20	20	inkscape:export-xdpi="90"
21	21	inkscape:export-ydpi="90">

trunk/resources/images/dialogs/conflict/copyaftercurrentright.svg

r8032	r18329
17	17	sodipodi:docname="copyaftercurrentright.svg"
18	18	inkscape:output_extension="org.inkscape.output.svg.inkscape"
19		inkscape:export-filename="~~C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\~~copybeforecurrentleft.png"
	19	inkscape:export-filename="copybeforecurrentleft.png"
20	20	inkscape:export-xdpi="90"
21	21	inkscape:export-ydpi="90">

trunk/resources/images/dialogs/conflict/copybeforecurrentleft.svg

r8032	r18329
17	17	sodipodi:docname="copybeforecurrentleft.svg"
18	18	inkscape:output_extension="org.inkscape.output.svg.inkscape"
19		inkscape:export-filename="~~C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\~~copyendleft.png"
	19	inkscape:export-filename="copyendleft.png"
20	20	inkscape:export-xdpi="90"
21	21	inkscape:export-ydpi="90">

trunk/resources/images/dialogs/conflict/copybeforecurrentright.svg

r8032	r18329
17	17	sodipodi:docname="copybeforecurrentrightsvg"
18	18	inkscape:output_extension="org.inkscape.output.svg.inkscape"
19		inkscape:export-filename="~~C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\~~copyendleft.png"
	19	inkscape:export-filename="copyendleft.png"
20	20	inkscape:export-xdpi="90"
21	21	inkscape:export-ydpi="90">

trunk/resources/images/dialogs/conflict/copyendleft.svg

r8032	r18329
17	17	sodipodi:docname="copyendleft.svg"
18	18	inkscape:output_extension="org.inkscape.output.svg.inkscape"
19		inkscape:export-filename="~~C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\~~copystartleft.png"
	19	inkscape:export-filename="copystartleft.png"
20	20	inkscape:export-xdpi="90"
21	21	inkscape:export-ydpi="90">

trunk/resources/images/dialogs/conflict/copyendright.svg

r8032	r18329
17	17	sodipodi:docname="copyendright.svg"
18	18	inkscape:output_extension="org.inkscape.output.svg.inkscape"
19		inkscape:export-filename="~~C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\~~copystartleft.png"
	19	inkscape:export-filename="copystartleft.png"
20	20	inkscape:export-xdpi="90"
21	21	inkscape:export-ydpi="90">

trunk/resources/images/dialogs/conflict/copystartleft.svg

r8032	r18329
17	17	sodipodi:docname="copystartleft.svg"
18	18	inkscape:output_extension="org.inkscape.output.svg.inkscape"
19		inkscape:export-filename="~~C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\~~copystartleft.png"
	19	inkscape:export-filename="copystartleft.png"
20	20	inkscape:export-xdpi="90"
21	21	inkscape:export-ydpi="90">

trunk/resources/images/dialogs/conflict/copystartright.svg

r8032	r18329
17	17	sodipodi:docname="copystartright.svg"
18	18	inkscape:output_extension="org.inkscape.output.svg.inkscape"
19		inkscape:export-filename="~~C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\~~copystartleft.png"
	19	inkscape:export-filename="copystartleft.png"
20	20	inkscape:export-xdpi="90"
21	21	inkscape:export-ydpi="90">

trunk/resources/images/dialogs/conflict/mergeincomplete.svg

r8032	r18329
17	17	sodipodi:docname="mergeincomplete.svg"
18	18	inkscape:output_extension="org.inkscape.output.svg.inkscape"
19		inkscape:export-filename="~~C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\~~mergecomplete.png"
	19	inkscape:export-filename="mergecomplete.png"
20	20	inkscape:export-xdpi="90"
21	21	inkscape:export-ydpi="90">

trunk/resources/images/dialogs/conflict/movedown.svg

r8032	r18329
17	17	sodipodi:docname="movedown.svg"
18	18	inkscape:output_extension="org.inkscape.output.svg.inkscape"
19		inkscape:export-filename="~~C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\~~moveup.png"
	19	inkscape:export-filename="moveup.png"
20	20	inkscape:export-xdpi="90"
21	21	inkscape:export-ydpi="90">

trunk/resources/images/dialogs/conflict/moveup.svg

r8032	r18329
17	17	sodipodi:docname="moveup.svg"
18	18	inkscape:output_extension="org.inkscape.output.svg.inkscape"
19		inkscape:export-filename="~~C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\~~copyaftercurrentright.png"
	19	inkscape:export-filename="copyaftercurrentright.png"
20	20	inkscape:export-xdpi="90"
21	21	inkscape:export-ydpi="90">

trunk/resources/images/dialogs/conflict/remove.svg

r8032	r18329
17	17	sodipodi:docname="remove.svg"
18	18	inkscape:output_extension="org.inkscape.output.svg.inkscape"
19		inkscape:export-filename="~~C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\~~remove.png"
	19	inkscape:export-filename="remove.png"
20	20	inkscape:export-xdpi="90"
21	21	inkscape:export-ydpi="90">

trunk/resources/images/dialogs/conflict/tagconflictunresolved.svg

r13363	r18329
18	18	sodipodi:docname="tagconflictunresolved"
19	19	inkscape:output_extension="org.inkscape.output.svg.inkscape"
20		inkscape:export-filename="~~C:\data\projekte\eclipse-3.4.1-ws\JOSM-new\images\dialogs\conflict\~~tagconflictunresolved.png"
	20	inkscape:export-filename="tagconflictunresolved.png"
21	21	inkscape:export-xdpi="90"
22	22	inkscape:export-ydpi="90">

trunk/resources/images/dialogs/conflict/tagkeepmine.svg

r8032	r18329
17	17	sodipodi:docname="tagkeepmine.svg"
18	18	inkscape:output_extension="org.inkscape.output.svg.inkscape"
19		inkscape:export-filename="~~C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\~~copyendleft.png"
	19	inkscape:export-filename="copyendleft.png"
20	20	inkscape:export-xdpi="90"
21	21	inkscape:export-ydpi="90">

trunk/resources/images/dialogs/conflict/tagkeeptheir.svg

r8032	r18329
17	17	sodipodi:docname="tagkeeptheir.svg"
18	18	inkscape:output_extension="org.inkscape.output.svg.inkscape"
19		inkscape:export-filename="~~C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\~~tagkeepmine.png"
	19	inkscape:export-filename="tagkeepmine.png"
20	20	inkscape:export-xdpi="90"
21	21	inkscape:export-ydpi="90">

trunk/resources/images/dialogs/conflict/tagundecide.svg

r8032	r18329
17	17	sodipodi:docname="tagundecide.svg"
18	18	inkscape:output_extension="org.inkscape.output.svg.inkscape"
19		inkscape:export-filename="~~C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\~~tagundecide.png"
	19	inkscape:export-filename="tagundecide.png"
20	20	inkscape:export-xdpi="90"
21	21	inkscape:export-ydpi="90">

trunk/resources/images/dialogs/conflict/useallleft.svg

r16724	r18329
18	18	sodipodi:docname="useallleft.svg"
19	19	inkscape:output_extension="org.inkscape.output.svg.inkscape"
20		inkscape:export-filename="~~C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\~~copystartleft.png"
	20	inkscape:export-filename="copystartleft.png"
21	21	inkscape:export-xdpi="90"
22	22	inkscape:export-ydpi="90">

trunk/resources/images/dialogs/conflict/useallright.svg

r16724	r18329
18	18	sodipodi:docname="useallright.svg"
19	19	inkscape:output_extension="org.inkscape.output.svg.inkscape"
20		inkscape:export-filename="~~C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\~~copystartleft.png"
	20	inkscape:export-filename="copystartleft.png"
21	21	inkscape:export-xdpi="90"
22	22	inkscape:export-ydpi="90">

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 18329 in josm for trunk/resources/images/dialogs/conflict

Legend:

Download in other formats: