[Enigma-cvs] enigma/data/gfx Makefile.am, 1.2, 1.3 fl-himalaya.png, 1.1, 1.2 items.png, 1.6, 1.7 st-coin2slot.png, 1.1, 1.2 st-coinslot.png, 1.1, 1.2 st-rock3.xcf, 1.1, 1.2 st-rock4.png, 1.1, 1.2 st-yinyang2.png, 1.2, 1.3

[Daniel Heck <address@hidden>]

Update of /cvsroot/enigma/enigma/data/gfx
In directory subversions:/tmp/cvs-serv9138/data/gfx

Modified Files:
        Makefile.am fl-himalaya.png items.png st-coin2slot.png 
        st-coinslot.png st-rock3.xcf st-rock4.png st-yinyang2.png 
Log Message:
Merged changes from 0_80_rc branch

Index: st-rock3.xcf
===================================================================
RCS file: /cvsroot/enigma/enigma/data/gfx/st-rock3.xcf,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsvcio1P and /tmp/cvsGxmKOv differ

Index: st-yinyang2.png
===================================================================
RCS file: /cvsroot/enigma/enigma/data/gfx/st-yinyang2.png,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsRBGRgR and /tmp/cvssuKYjy differ

Index: st-rock4.png
===================================================================
RCS file: /cvsroot/enigma/enigma/data/gfx/st-rock4.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsuw8iuS and /tmp/cvse2WnKA differ

Index: fl-himalaya.png
===================================================================
RCS file: /cvsroot/enigma/enigma/data/gfx/fl-himalaya.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsthdnHT and /tmp/cvsKvIq7C differ

Index: st-coin2slot.png
===================================================================
RCS file: /cvsroot/enigma/enigma/data/gfx/st-coin2slot.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsuL4GRU and /tmp/cvsWQ0btF differ

Index: Makefile.am
===================================================================
RCS file: /cvsroot/enigma/enigma/data/gfx/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am 30 Jan 2003 20:27:57 -0000      1.2
--- Makefile.am 18 Oct 2003 13:49:00 -0000      1.3
***************
*** 1,3 ****
  pkgdatadir = $(datadir)/@PACKAGE@/gfx
  pkgdata_DATA = enigma.pal $(wildcard *.png)
! EXTRA_DIST = $(pkgdata_DATA)
\ No newline at end of file
--- 1,3 ----
  pkgdatadir = $(datadir)/@PACKAGE@/gfx
  pkgdata_DATA = enigma.pal $(wildcard *.png)
! EXTRA_DIST = $(pkgdata_DATA)

Index: items.png
===================================================================
RCS file: /cvsroot/enigma/enigma/data/gfx/items.png,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
Binary files /tmp/cvsnMVh9U and /tmp/cvsoY6FjI differ

Index: st-coinslot.png
===================================================================
RCS file: /cvsroot/enigma/enigma/data/gfx/st-coinslot.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsqFBDmW and /tmp/cvsqWPbwI differ