diff options
| author | Micksha <ms-shaman@gmx.de> | 2019-10-16 14:46:13 +0000 |
|---|---|---|
| committer | Micksha <ms-shaman@gmx.de> | 2019-10-16 14:46:13 +0000 |
| commit | ef0b7dda921b8a7137545b483902c51dd4866b84 (patch) | |
| tree | 064bf6843e52c8c14c60b09b8888ecb78da0bfb5 /Other | |
| parent | c63153b8550e640e4b476d452b88fc2dbc3bb5af (diff) | |
| parent | 23b0422bb152c51d504ffa589fa8ad52619b5f47 (diff) | |
| download | evol-media-ef0b7dda921b8a7137545b483902c51dd4866b84.tar.gz evol-media-ef0b7dda921b8a7137545b483902c51dd4866b84.tar.bz2 evol-media-ef0b7dda921b8a7137545b483902c51dd4866b84.tar.xz evol-media-ef0b7dda921b8a7137545b483902c51dd4866b84.zip | |
Merge branch 'mickmedia' into 'master'
Mickmedia
See merge request evol/evol-media!6
Diffstat (limited to 'Other')
| -rw-r--r-- | Other/Sprites/firedummy2.xcf | bin | 0 -> 966733 bytes |
| -rw-r--r-- | Other/Sprites/growing flowers.xcf | bin | 0 -> 146116 bytes |
| -rw-r--r-- | Other/Sprites/rowboat.xcf | bin | 0 -> 3307512 bytes |
| -rw-r--r-- | Other/evol_colorschemes.png | bin | 0 -> 26520 bytes |
| -rw-r--r-- | Other/evol_colorschemes.xcf | bin | 0 -> 81917 bytes |
| -rw-r--r-- | Other/worldmap_mick_0.4.png (renamed from Other/WorldMap.png) | bin | 3744323 -> 3744323 bytes |
| -rw-r--r-- | Other/worldmap_mick_3.1.png | bin | 0 -> 2790787 bytes |
| -rw-r--r-- | Other/worldmap_mick_3.1.xcf | bin | 0 -> 75002972 bytes |
8 files changed, 0 insertions, 0 deletions
diff --git a/Other/Sprites/firedummy2.xcf b/Other/Sprites/firedummy2.xcf Binary files differnew file mode 100644 index 0000000..0476c23 --- /dev/null +++ b/Other/Sprites/firedummy2.xcf diff --git a/Other/Sprites/growing flowers.xcf b/Other/Sprites/growing flowers.xcf Binary files differnew file mode 100644 index 0000000..b6f1728 --- /dev/null +++ b/Other/Sprites/growing flowers.xcf diff --git a/Other/Sprites/rowboat.xcf b/Other/Sprites/rowboat.xcf Binary files differnew file mode 100644 index 0000000..8902646 --- /dev/null +++ b/Other/Sprites/rowboat.xcf diff --git a/Other/evol_colorschemes.png b/Other/evol_colorschemes.png Binary files differnew file mode 100644 index 0000000..82809fa --- /dev/null +++ b/Other/evol_colorschemes.png diff --git a/Other/evol_colorschemes.xcf b/Other/evol_colorschemes.xcf Binary files differnew file mode 100644 index 0000000..78ad78f --- /dev/null +++ b/Other/evol_colorschemes.xcf diff --git a/Other/WorldMap.png b/Other/worldmap_mick_0.4.png Binary files differindex dc11f06..dc11f06 100644 --- a/Other/WorldMap.png +++ b/Other/worldmap_mick_0.4.png diff --git a/Other/worldmap_mick_3.1.png b/Other/worldmap_mick_3.1.png Binary files differnew file mode 100644 index 0000000..7c8cc39 --- /dev/null +++ b/Other/worldmap_mick_3.1.png diff --git a/Other/worldmap_mick_3.1.xcf b/Other/worldmap_mick_3.1.xcf Binary files differnew file mode 100644 index 0000000..ba99979 --- /dev/null +++ b/Other/worldmap_mick_3.1.xcf |
