fixed compile error with seibuspi

code got refactored, needed to refactor the spritebuffer hack to match
fixed compile error, disabled Rally Bike hack

Rally Bike now uses toaplan_scu.c to draw its sprites

Issue #40
Removed -march-native by default to fix compile error on 32bit systems

Also put a note in the makefile explaining this change
Added custom merge script, inducing fake merge conflicts for lst/mak

You may need to add the following to your git config:
[merge "verify"]
        name = merge and verify driver
        driver = ./mamemerge %A %O %B
fix compile errors
fixed crash in fireshrk/vimana

Signed-off-by: Andy Welsh <oboewan42@gmail.com>
changed folder structure
line ending normalization
Merge branch 'bleeding' - updated to MAMEPlus 0.149u1

* bleeding:
  changed folder structure
  fixed crash in fireshrk/vimana
  fix compile errors
  Added custom merge script, inducing fake merge conflicts for lst/mak
  Removed -march-native by default to fix compile error on 32bit systems
  fixed compile error, disabled Rally Bike hack
  fixed compile error with seibuspi
  * [MAME] Updated to MAME 0.149u1
  Sync to MAMEPlus SVN r8056 (MAME SVN r24035)

Conflicts:
	.gitattributes
added .gitattributes
normalize line endings
more normalizations
Merge branch 'master' into mamesvn

* master:
  line ending normalization
  changed folder structure
  fixed crash in fireshrk/vimana
  fix compile errors
  Added custom merge script, inducing fake merge conflicts for lst/mak
  Removed -march-native by default to fix compile error on 32bit systems
  fixed compile error, disabled Rally Bike hack
  fixed compile error with seibuspi

Conflicts:
	.gitattributes