Viewing all changes in revision 4928.
- Committer: Stefan Eilemann
- Date: 2011-11-10 09:54:57 UTC
- mfrom: (4926.1.93)
- Revision ID: git-v1:27c64f01e07c9f3e155459a8c02c7f2617b03767
Merge branch 'master' of https://github.com/Eyescale/Equalizer
Conflicts:
commitMessage.txt
Conflicts:
commitMessage.txt
- files added:
- CMake/2.8
- MacPorts
- MacPorts/graphics
- MacPorts/graphics/Equalizer
- tests/seq
- files removed:
- libs/GLEW/glew-1.6.0.tgz
- tests/co/openmp
- tests/eq/server/reliability
- files modified:
- AUTHORS
expand all
collapse all
added
removed
