Merge branch 'master' into PVR

Conflicts:
	addon.xml
	build.bat
This commit is contained in:
JezzX
2012-01-12 15:31:14 +11:00
27 changed files with 691 additions and 803 deletions

View File

@ -7,7 +7,7 @@
<string id="31004">Home</string>
<string id="31005">Memory Used:</string>
<string id="31006">End Time:</string>
<string id="31007"></string>
<string id="31007">Data Provider</string>
<string id="31008"></string>
<string id="31009"></string>
<string id="31010">FANART[CR]IMAGE[CR]NOT[CR]AVAILABLE</string>