diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-21 12:46:19 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-21 12:46:19 +0100 |
commit | ad2ef517bd702c352d7a4d5b64db0e99f04721c2 (patch) | |
tree | 540ef4c700ee35c2b177e219a9c0092a3a9aa29c /graphics/map_objects | |
parent | 77352c7ee480fe3127692ce50a6bdd019de87291 (diff) | |
parent | 8a60952fc01ada92e029be488481a29da32f47eb (diff) |
option menu fix conflicts
Diffstat (limited to 'graphics/map_objects')
-rwxr-xr-x | graphics/map_objects/pics/effects/unknown_4F6D38/0.png | bin | 0 -> 130 bytes |
-rwxr-xr-x | graphics/map_objects/pics/effects/unknown_4F7E38/0.png | bin | 0 -> 175 bytes |
-rwxr-xr-x | graphics/map_objects/pics/effects/unused_grass/0.png | bin | 0 -> 231 bytes |
-rwxr-xr-x | graphics/map_objects/pics/effects/unused_grass/1.png | bin | 0 -> 228 bytes |
-rwxr-xr-x | graphics/map_objects/pics/effects/unused_grass/2.png | bin | 0 -> 230 bytes |
-rwxr-xr-x | graphics/map_objects/pics/effects/unused_grass/3.png | bin | 0 -> 232 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/graphics/map_objects/pics/effects/unknown_4F6D38/0.png b/graphics/map_objects/pics/effects/unknown_4F6D38/0.png Binary files differnew file mode 100755 index 000000000..3ee87e1cd --- /dev/null +++ b/graphics/map_objects/pics/effects/unknown_4F6D38/0.png diff --git a/graphics/map_objects/pics/effects/unknown_4F7E38/0.png b/graphics/map_objects/pics/effects/unknown_4F7E38/0.png Binary files differnew file mode 100755 index 000000000..685aee28b --- /dev/null +++ b/graphics/map_objects/pics/effects/unknown_4F7E38/0.png diff --git a/graphics/map_objects/pics/effects/unused_grass/0.png b/graphics/map_objects/pics/effects/unused_grass/0.png Binary files differnew file mode 100755 index 000000000..2e16f15cb --- /dev/null +++ b/graphics/map_objects/pics/effects/unused_grass/0.png diff --git a/graphics/map_objects/pics/effects/unused_grass/1.png b/graphics/map_objects/pics/effects/unused_grass/1.png Binary files differnew file mode 100755 index 000000000..dd33b0d88 --- /dev/null +++ b/graphics/map_objects/pics/effects/unused_grass/1.png diff --git a/graphics/map_objects/pics/effects/unused_grass/2.png b/graphics/map_objects/pics/effects/unused_grass/2.png Binary files differnew file mode 100755 index 000000000..345d454cd --- /dev/null +++ b/graphics/map_objects/pics/effects/unused_grass/2.png diff --git a/graphics/map_objects/pics/effects/unused_grass/3.png b/graphics/map_objects/pics/effects/unused_grass/3.png Binary files differnew file mode 100755 index 000000000..087676102 --- /dev/null +++ b/graphics/map_objects/pics/effects/unused_grass/3.png |