Merge remote-tracking branch 'remotes/origin/MultipleMediaUI'

author spx <spx268@gmail.com>

Sat, 7 Jun 2014 16:11:46 +0000 (01:11 +0900)

committer spx <spx268@gmail.com>

Sat, 7 Jun 2014 16:11:46 +0000 (01:11 +0900)
author spx <spx268@gmail.com>
Sat, 7 Jun 2014 16:11:46 +0000 (01:11 +0900)
committer spx <spx268@gmail.com>
Sat, 7 Jun 2014 16:11:46 +0000 (01:11 +0900)
diff --cc OpenTween/OpenTween.csproj
Simple merge
diff --cc OpenTween/Properties/Resources.Designer.cs
Simple merge
diff --cc OpenTween/Properties/Resources.en.resx
Simple merge
diff --cc OpenTween/Properties/Resources.resx
Simple merge
diff --cc OpenTween/Tween.cs
Simple merge
diff --cc OpenTween/Tween.resx
Simple merge
author	spx <spx268@gmail.com>
	Sat, 7 Jun 2014 16:11:46 +0000 (01:11 +0900)
committer	spx <spx268@gmail.com>
	Sat, 7 Jun 2014 16:11:46 +0000 (01:11 +0900)
		1	2
OpenTween/OpenTween.csproj	patch \|	diff1 \|	diff2 \|	blob \| history
OpenTween/Properties/Resources.Designer.cs	patch \|	diff1 \|	diff2 \|	blob \| history
OpenTween/Properties/Resources.en.resx	patch \|	diff1 \|	diff2 \|	blob \| history
OpenTween/Properties/Resources.resx	patch \|	diff1 \|	diff2 \|	blob \| history
OpenTween/Tween.cs	patch \|	diff1 \|	diff2 \|	blob \| history
OpenTween/Tween.resx	patch \|	diff1 \|	diff2 \|	blob \| history