diff options
| author | orwell96 <orwell@bleipb.de> | 2018-12-03 23:17:35 +0100 |
|---|---|---|
| committer | orwell96 <orwell@bleipb.de> | 2018-12-03 23:17:35 +0100 |
| commit | 8928f78ee6305e29ed8d3b9395fcb6564c984fdf (patch) | |
| tree | cd250c2b98d7131158e3744efe238780cec73fec /signs_road/textures | |
| parent | eccdad46ef2b38cd061aab7ae6bcb252a67c2218 (diff) | |
| parent | a3e0d36a68247cac40349d9089fe3c71546d75e8 (diff) | |
| download | display_modpack-master.tar.gz display_modpack-master.tar.bz2 display_modpack-master.zip | |
Resolved conflicts by reordering of files
Diffstat (limited to 'signs_road/textures')
| -rw-r--r-- | signs_road/textures/signs_road_blue.png | bin | 436 -> 302 bytes |
| -rw-r--r-- | signs_road/textures/signs_road_blue_dir_inventory.png | bin | 0 -> 377 bytes |
| -rw-r--r-- | signs_road/textures/signs_road_blue_direction.png | bin | 0 -> 1108 bytes |
| -rw-r--r-- | signs_road/textures/signs_road_blue_street.png | bin | 0 -> 436 bytes |
| -rw-r--r-- | signs_road/textures/signs_road_red.png | bin | 0 -> 282 bytes |
| -rw-r--r-- | signs_road/textures/signs_road_red_dir_inventory.png | bin | 0 -> 289 bytes |
| -rw-r--r-- | signs_road/textures/signs_road_red_direction.png | bin | 0 -> 1071 bytes |
7 files changed, 0 insertions, 0 deletions
diff --git a/signs_road/textures/signs_road_blue.png b/signs_road/textures/signs_road_blue.png Binary files differindex 540a390..51dc83b 100644 --- a/signs_road/textures/signs_road_blue.png +++ b/signs_road/textures/signs_road_blue.png diff --git a/signs_road/textures/signs_road_blue_dir_inventory.png b/signs_road/textures/signs_road_blue_dir_inventory.png Binary files differnew file mode 100644 index 0000000..426c997 --- /dev/null +++ b/signs_road/textures/signs_road_blue_dir_inventory.png diff --git a/signs_road/textures/signs_road_blue_direction.png b/signs_road/textures/signs_road_blue_direction.png Binary files differnew file mode 100644 index 0000000..bba2b00 --- /dev/null +++ b/signs_road/textures/signs_road_blue_direction.png diff --git a/signs_road/textures/signs_road_blue_street.png b/signs_road/textures/signs_road_blue_street.png Binary files differnew file mode 100644 index 0000000..540a390 --- /dev/null +++ b/signs_road/textures/signs_road_blue_street.png diff --git a/signs_road/textures/signs_road_red.png b/signs_road/textures/signs_road_red.png Binary files differnew file mode 100644 index 0000000..5614f6f --- /dev/null +++ b/signs_road/textures/signs_road_red.png diff --git a/signs_road/textures/signs_road_red_dir_inventory.png b/signs_road/textures/signs_road_red_dir_inventory.png Binary files differnew file mode 100644 index 0000000..4d9d559 --- /dev/null +++ b/signs_road/textures/signs_road_red_dir_inventory.png diff --git a/signs_road/textures/signs_road_red_direction.png b/signs_road/textures/signs_road_red_direction.png Binary files differnew file mode 100644 index 0000000..632a925 --- /dev/null +++ b/signs_road/textures/signs_road_red_direction.png |
