Merge pull request #3819 from arnova/subtitles_for_stacks

author jmarshallnz <jcmarsha@gmail.com>

Wed, 5 Feb 2014 05:22:42 +0000 (21:22 -0800)

committer jmarshallnz <jcmarsha@gmail.com>

Wed, 5 Feb 2014 05:22:42 +0000 (21:22 -0800)
author jmarshallnz <jcmarsha@gmail.com>
Wed, 5 Feb 2014 05:22:42 +0000 (21:22 -0800)
committer jmarshallnz <jcmarsha@gmail.com>
Wed, 5 Feb 2014 05:22:42 +0000 (21:22 -0800)
diff --cc xbmc/Application.cpp
Simple merge
diff --cc xbmc/video/dialogs/GUIDialogSubtitles.cpp
Simple merge
author	jmarshallnz <jcmarsha@gmail.com>
	Wed, 5 Feb 2014 05:22:42 +0000 (21:22 -0800)
committer	jmarshallnz <jcmarsha@gmail.com>
	Wed, 5 Feb 2014 05:22:42 +0000 (21:22 -0800)
		1	2
xbmc/Application.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
xbmc/video/dialogs/GUIDialogSubtitles.cpp	patch \|	diff1 \|	diff2 \|	blob \| history