Merge branch 'master' of https://github.com/simlrh/OSVR-OpenHMD

simlrh · simlrh · commit d61b05907ec3 · 2016-09-23T13:02:54.000+01:00
diff --git a/sample-configs/osvr_server_config.json b/sample-configs/osvr_server_config.json
@@ -1,4 +1,4 @@
 {
  	"display": "Oculus_Rift_DK1.json",
-	"renderManagerConfig": "enderManager.extended.landscape.json"
+	"renderManagerConfig": "renderManager.extended.landscape.json"
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`	`2`	`"display": "Oculus_Rift_DK1.json",`
`3`		`- "renderManagerConfig": "enderManager.extended.landscape.json"`
	`3`	`+ "renderManagerConfig": "renderManager.extended.landscape.json"`
`4`	`4`	`}`