Explorar o código

Merge branch 'master' into dev

Conflicts:
	dotnet/Properties/AssemblyInfo.cs
	source/windows/WinMain.cpp

Source commit: 32ebb8c765457368e9578e8f865e127d3449d853
Martin Prikryl %!s(int64=8) %!d(string=hai) anos
pai
achega
e7637dd3d3

Os datos das diferenzas Diff non están dispoñibles.