summaryrefslogtreecommitdiff
path: root/mesecons_textures
diff options
context:
space:
mode:
authorJeija <norrepli@googlemail.com>2012-08-11 22:18:47 -0700
committerJeija <norrepli@googlemail.com>2012-08-11 22:18:47 -0700
commit6d208f6bca64c31aea2fb35caad3576d1e201463 (patch)
tree5535bf2cbd0039740370e610cc445899f1000fd0 /mesecons_textures
parent8f0d765ffe1449f3fada57a5aed2c4958b6d80d4 (diff)
parentb2a6553ff3eef75e440ad226120a782cbfa5ab46 (diff)
downloadmesecons-6d208f6bca64c31aea2fb35caad3576d1e201463.tar
mesecons-6d208f6bca64c31aea2fb35caad3576d1e201463.tar.gz
mesecons-6d208f6bca64c31aea2fb35caad3576d1e201463.tar.bz2
mesecons-6d208f6bca64c31aea2fb35caad3576d1e201463.tar.xz
mesecons-6d208f6bca64c31aea2fb35caad3576d1e201463.zip
Merge pull request #20 from VanessaE/master
Multiple changes as discussed on IRC today
Diffstat (limited to 'mesecons_textures')
-rw-r--r--mesecons_textures/textures/jeija_microcontroller_sides.pngbin663 -> 613 bytes
-rw-r--r--mesecons_textures/textures/jeija_solar_panel.pngbin704 -> 686 bytes
-rw-r--r--mesecons_textures/textures/jeija_solar_panel_sides.pngbin0 -> 215 bytes
3 files changed, 0 insertions, 0 deletions
diff --git a/mesecons_textures/textures/jeija_microcontroller_sides.png b/mesecons_textures/textures/jeija_microcontroller_sides.png
index 8561567..b367644 100644
--- a/mesecons_textures/textures/jeija_microcontroller_sides.png
+++ b/mesecons_textures/textures/jeija_microcontroller_sides.png
Binary files differ
diff --git a/mesecons_textures/textures/jeija_solar_panel.png b/mesecons_textures/textures/jeija_solar_panel.png
index 30bab6f..5ff0640 100644
--- a/mesecons_textures/textures/jeija_solar_panel.png
+++ b/mesecons_textures/textures/jeija_solar_panel.png
Binary files differ
diff --git a/mesecons_textures/textures/jeija_solar_panel_sides.png b/mesecons_textures/textures/jeija_solar_panel_sides.png
new file mode 100644
index 0000000..c5fac85
--- /dev/null
+++ b/mesecons_textures/textures/jeija_solar_panel_sides.png
Binary files differ