summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2016-08-04 00:23:44 +0000
committerReid <reidyaro@gmail.com>2016-08-04 00:23:44 +0000
commitca33ccd2101b523a41d0b495102652c50b36033e (patch)
tree273ef0f4bb7ac09bc7f2edb7d0b5fb922d7606de
parent02956cd015ee4701eff5382fd81a9b6fe6b3f9fd (diff)
parent3487d0518ffcd64af9af96583ec5ef08c74ca13d (diff)
downloadevol-media-ca33ccd2101b523a41d0b495102652c50b36033e.tar.gz
evol-media-ca33ccd2101b523a41d0b495102652c50b36033e.tar.bz2
evol-media-ca33ccd2101b523a41d0b495102652c50b36033e.tar.xz
evol-media-ca33ccd2101b523a41d0b495102652c50b36033e.zip
Merge branch 'brushes' into 'master'
Brushes Ship and Bridge Brush See merge request !1
-rw-r--r--LICENSE2
-rw-r--r--Other/bridge.gbrbin0 -> 871 bytes
-rw-r--r--Other/ship.gbrbin0 -> 567 bytes
3 files changed, 2 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index 46174d0..10c6642 100644
--- a/LICENSE
+++ b/LICENSE
@@ -41,6 +41,8 @@ https://www.gitorious.org/evol/evol-media/blobs/master/LICENSE
# Other
Other/Map.xcf (Reid) (CC BY-SA 3.0) (-)
+ Other/Bridge.gbr (Wushin) (CC BY-SA 3.0) (-)
+ Other/ship.gbr (Wushin) (CC BY-SA 3.0) (-)
# Tiled animation
Tiled animation/water.tsx (Reid) (CC BY-SA 3.0) (-)
diff --git a/Other/bridge.gbr b/Other/bridge.gbr
new file mode 100644
index 0000000..eac4e3d
--- /dev/null
+++ b/Other/bridge.gbr
Binary files differ
diff --git a/Other/ship.gbr b/Other/ship.gbr
new file mode 100644
index 0000000..c6debe9
--- /dev/null
+++ b/Other/ship.gbr
Binary files differ