Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of git://github.com/Vocaluxe/Vocaluxe into develop

Browse Source 
Conflicts:
	ClientServerLib/ClientServerLib/CServer.cs
This commit is contained in:
Flamefire committed 2014-02-25 21:01:21 +01:00
2 parents 1b5f504763 722a3279d5
commit d4dc4f7c20
5 files changed
+73 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Languages/English.xml
+1
View File
@@ -217,4 +217,5 @@
<string name="TR_SCREENOVIDEOADJUSTMENTS_BOTTOMRIGHT">Bottom right</string>
<string name="TR_SCREENPVOLUMECONTROL_VOLUME">Volume</string>
<string name="TR_SCREENPSERVERQR_ADDRESS">Server address</string>
<string name="TR_SCREENPSERVERQR_NOTRUNNING">Server is not running. Please check config.xml!</string>
</resources>