| commit | d73505887dc494403ba8d1e3beebee9dd6c168bb | [log] [tgz] |
|---|---|---|
| author | Camilla Berglund <elmindreda@users.sourceforge.net> | Sat Sep 25 19:13:40 2010 +0200 |
| committer | Camilla Berglund <elmindreda@users.sourceforge.net> | Sat Sep 25 19:13:40 2010 +0200 |
| tree | 16940c011a9e4c639671d8c4013b35fe34fe0714 | |
| parent | b9769dea77786adb8397f7e4d9680bef0dbfc45a [diff] | |
| parent | 70647eaad5cc22c8edc578f1a4b6be1a6cedd2fb [diff] |
Merge branch 'master' of ssh://glfw.git.sourceforge.net/gitroot/glfw/glfw Conflicts: examples/CMakeLists.txt