Skip to content

Commit

Permalink
Merge pull request #199 from hcmlab/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
tobiasbaur authored Apr 5, 2017
2 parents f288e65 + c872a8d commit b52b272
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Controls/MainHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace ssi
{
public partial class MainHandler
{
public static string BuildVersion = "0.9.9.6.5";
public static string BuildVersion = "0.9.9.6.6";

private static Timeline timeline = null;

Expand Down
6 changes: 3 additions & 3 deletions Database/DatabaseHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -904,9 +904,9 @@ public static class DatabaseDefinitionCollections
public static string Sessions = "Sessions";
public static string Roles = "Roles";
public static string Subjects = "Subjects";
public static string Streams = "Media";
public static string StreamTypes = "MediaTypes";
public static string Schemes = "AnnotationSchemes";
public static string Streams = "Streams";
public static string StreamTypes = "StreamTypes";
public static string Schemes = "Schemes";

}

Expand Down
Binary file modified bin/nova.exe
Binary file not shown.

0 comments on commit b52b272

Please sign in to comment.