Skip to content
Permalink
Browse files

CR #358

  • Loading branch information
Stefan Eilemann Stefan Eilemann
Stefan Eilemann authored and Stefan Eilemann committed Aug 18, 2014
1 parent f4b5d5e commit 54b05c7535e8f0d74e9d2a42cad4f6915fde56dc
Showing with 6 additions and 5 deletions.
  1. +5 −0 .gitattributes
  2. +1 −5 examples/configs/issue304.eqc
@@ -1,3 +1,8 @@
/tests export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.travis.yml merge=ours
CMake/FindPackages.cmake merge=ours
CMake/FindRequired.cmake merge=ours
CMake/GitExternal.cmake merge=ours
CMake/depends.txt merge=ours
@@ -3,7 +3,6 @@
# 'Hello, World!' config: one window rendering from the application process.
server
{
connection { hostname "127.0.0.1" }
config
{
appNode
@@ -13,14 +12,11 @@ server
device 4242
window
{
viewport [ 0.25 0.25 0.5 0.5 ]

channel { name "channel" }
}
}
}
observer{} # vrpn_tracker "Tracker0@localhost" }
layout{ view { observer 0 }}
layout{ view { }}
canvas
{
layout 0

0 comments on commit 54b05c7

Please sign in to comment.
You can’t perform that action at this time.