Merge pull request #498 from cptspiff/starttrack

author Arne Morten Kvarving <spiff@xbmc.org>

Tue, 18 Oct 2011 17:20:45 +0000 (10:20 -0700)

committer Arne Morten Kvarving <spiff@xbmc.org>

Tue, 18 Oct 2011 17:20:45 +0000 (10:20 -0700)
author Arne Morten Kvarving <spiff@xbmc.org>
Tue, 18 Oct 2011 17:20:45 +0000 (10:20 -0700)
committer Arne Morten Kvarving <spiff@xbmc.org>
Tue, 18 Oct 2011 17:20:45 +0000 (10:20 -0700)
diff --cc xbmc/Application.cpp
Simple merge
diff --cc xbmc/Application.h
Simple merge
author	Arne Morten Kvarving <spiff@xbmc.org>
	Tue, 18 Oct 2011 17:20:45 +0000 (10:20 -0700)
committer	Arne Morten Kvarving <spiff@xbmc.org>
	Tue, 18 Oct 2011 17:20:45 +0000 (10:20 -0700)
		1	2
xbmc/Application.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
xbmc/Application.h	patch \|	diff1 \|	diff2 \|	blob \| history