Updated CONTRIBUTORS file
Merge pull request #28 from ethanhugg/master

Updated CONTRIBUTORS file
Convert source files to unix newlines

Most files were converted in ff6b669176, but some (non C++
source files) were left with windows newlines.
Remove trailing whitespace

Most of it was removed in ff6b669176 from C++ source files,
but other files were left unchanged.
Include the platform makefile before adding defines for x86 asm

This fixes building with BUILDTYPE=Release on OS X.
Don't include the MFC header afxres.h in windows resource files

Just include windows.h instead. This allows building using the
Express edition versions of MSVC as well, that don't include MFC.
Add a missing NO_DYNAMIC_VP ifdef in the CWelsLib destructor

Previously this would try to free a dynamically loaded library
even if none was loaded.
Merge pull request #37 from mstorsjo/no-dynamic-close

Add a missing NO_DYNAMIC_VP ifdef in the CWelsLib destructor
Merge pull request #34 from mstorsjo/make-asm-override

Include the platform makefile before adding defines for x86 asm
Merge pull request #36 from mstorsjo/no-mfc-include

Don't include the MFC header afxres.h in windows resource files
Merge pull request #32 from mstorsjo/cosmetics

Consistently use unix newlines, remove trailing whitespace
start playing with travis
Merge remote-tracking branch 'upstream/master'
Merge pull request #39 from fluffy/travis1

Adding Initial config file for Travis
Added apt-get lines to travis.yml
Merge pull request #40 from ethanhugg/travis1

Added apt-get lines to travis.yml
Fix warnings on OSX compile
Updated contributors file
Merge pull request #42 from ethanhugg/cosmetic

Updated contributors file
Add make test to Travis