Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Leonardo Galli
2017-04-10 15:54:45 +02:00
5 changed files with 40 additions and 21 deletions

View File

@@ -1,6 +1,6 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{57A04B72-8088-4F75-A582-1158CF8291F7}"