Merge branch 'prototype' of https://github.com/Zharay/KanColleViewer … · Zharay/KanColleViewer@a9ef639 · GitHub

Commit

Merge branch 'prototype' of https://github.com/Zharay/KanColleViewer …

Browse files

…into prototype

Conflicts:
	Grabacr07.KanColleViewer/Properties/Resources.Designer.cs
	Grabacr07.KanColleViewer/Properties/Resources.en.resx
	Grabacr07.KanColleViewer/Properties/Resources.resx

Loading branch information

Zharay committed Apr 13, 2014

2 parents ab29a8c + b8c3166 commit a9ef639