Merge branch 'master' of github.com:glenux/wyrian

2011-02-12 16:02:47 +01:00 · 2011-02-12 16:02:47 +01:00 · af7c7975ad
commit af7c7975ad
parent 4f18de0e1b 6d63d09c64
23 changed files with 7 additions and 0 deletions
--- a/guiltouf/images/blueprint.ora
+++ b/guiltouf/images/blueprint.ora
--- a/guiltouf/images/blueprint_bak.ora
+++ b/guiltouf/images/blueprint_bak.ora
--- a/guiltouf/images/reactor_fire.ora
+++ b/guiltouf/images/reactor_fire.ora
--- a/guiltouf/images/reactor_saxo.ora
+++ b/guiltouf/images/reactor_saxo.ora
--- a/guiltouf/images/reactor_trumpet.ora
+++ b/guiltouf/images/reactor_trumpet.ora
--- a/guiltouf/images/reactor_violin.ora
+++ b/guiltouf/images/reactor_violin.ora
--- a/guiltouf/images/spaceship_body.ora
+++ b/guiltouf/images/spaceship_body.ora
--- a/guiltouf/images/spaceship_wing.ora
+++ b/guiltouf/images/spaceship_wing.ora
--- a/guiltouf/images/wings_eagle.ora
+++ b/guiltouf/images/wings_eagle.ora
--- a/guiltouf/images/wings_flower.ora
+++ b/guiltouf/images/wings_flower.ora
--- a/guiltouf/images/wings_tronconeuse.ora
+++ b/guiltouf/images/wings_tronconeuse.ora
--- a/images/Makefile
+++ b/images/Makefile
@ -0,0 +1,7 @@
 resize:
 	rm -f sprites && mkdir sprites
 	for i in fullsize/*; do \
 		convert -resize 15% $$i $${i/fullsize/sprites}; \
 	done
--- a/images/original/spaceship_body.ora
+++ b/images/original/spaceship_body.ora
--- a/images/original/spaceship_body.png
+++ b/images/original/spaceship_body.png
--- a/images/sprites/reactor_fire.001.png
+++ b/images/sprites/reactor_fire.001.png
--- a/images/sprites/reactor_fire.002.png
+++ b/images/sprites/reactor_fire.002.png
--- a/images/sprites/reactor_fire.003.png
+++ b/images/sprites/reactor_fire.003.png
--- a/images/sprites/reactor_fire.004.png
+++ b/images/sprites/reactor_fire.004.png
--- a/images/sprites/reactor_fire.005.png
+++ b/images/sprites/reactor_fire.005.png
--- a/images/sprites/reactor_fire.png
+++ b/images/sprites/reactor_fire.png
--- a/images/sprites/wings_eagle.png
+++ b/images/sprites/wings_eagle.png
--- a/images/sprites/wings_flower.png
+++ b/images/sprites/wings_flower.png
--- a/images/sprites/wings_tronconeuse.png
+++ b/images/sprites/wings_tronconeuse.png