diff options
| author | Reid <reidyaro@gmail.com> | 2016-08-04 00:23:44 +0000 |
|---|---|---|
| committer | Reid <reidyaro@gmail.com> | 2016-08-04 00:23:44 +0000 |
| commit | ca33ccd2101b523a41d0b495102652c50b36033e (patch) | |
| tree | 273ef0f4bb7ac09bc7f2edb7d0b5fb922d7606de | |
| parent | 02956cd015ee4701eff5382fd81a9b6fe6b3f9fd (diff) | |
| parent | 3487d0518ffcd64af9af96583ec5ef08c74ca13d (diff) | |
| download | evol-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-- | LICENSE | 2 | ||||
| -rw-r--r-- | Other/bridge.gbr | bin | 0 -> 871 bytes | |||
| -rw-r--r-- | Other/ship.gbr | bin | 0 -> 567 bytes |
3 files changed, 2 insertions, 0 deletions
@@ -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 Binary files differnew file mode 100644 index 0000000..eac4e3d --- /dev/null +++ b/Other/bridge.gbr diff --git a/Other/ship.gbr b/Other/ship.gbr Binary files differnew file mode 100644 index 0000000..c6debe9 --- /dev/null +++ b/Other/ship.gbr |