Branch: refs/heads/master Home: https://github.com/ryanflannery/vitunes Commit: 1412f8d6145392e91b5337ba70fb599f691d3cb3 https://github.com/ryanflannery/vitunes/commit/1412f8d6145392e91b5337ba70fb599f691d3cb3 Author: Ryan Flannery <ryan.flannery@xxxxxxxxx> Date: 2012-01-22 (Sun, 22 Jan 2012) Changed paths: M Makefile A config.mk A configure.sh M doc/vitunes.1 M player.c M player.h A players/gstplayer.c A players/gstplayer.h Log Message: ----------- Merge branch 'master' into auto-tests Conflicts: Makefile Commit: 6e8ffc4bdf55dfe35ad922658b50360d8f67318a https://github.com/ryanflannery/vitunes/commit/6e8ffc4bdf55dfe35ad922658b50360d8f67318a Author: Ryan Flannery <ryan.flannery@xxxxxxxxx> Date: 2012-01-22 (Sun, 22 Jan 2012) Changed paths: A .gitignore M Makefile Log Message: ----------- Merge branch 'auto-tests' Compare: https://github.com/ryanflannery/vitunes/compare/3eaafe5...6e8ffc4
