Erik Faye-Lund e3ee8c2432 Merge branch 'work/for-master' into work/example-fixes ...

Conflicts:
	example_bass/example_bass.cpp

2011-01-26 00:16:27 +01:00

..

.gitignore

player: add API to save tracks

2010-12-27 20:32:55 +01:00

example_bass.cpp

Merge branch 'work/for-master' into work/example-fixes

2011-01-26 00:16:27 +01:00

example_bass.vcproj

example_bass: use folders for external deps

2011-01-14 00:38:42 +01:00

tune.ogg

here's the correct tune. old tune begone.

2010-03-19 17:41:08 +01:00