)]}'
{
  "commit": "854e634fec4475ac3aaf0ec7408d601a0e4eeb5d",
  "tree": "3fc2c41e59c2ea7b968fe0d38cd17ece6553aa45",
  "parents": [
    "f4880b920661822e1c984dd6b3212b736b67c7bf",
    "3c912cbc3c754874fe3e3eeb7e78f3dae1cb328d"
  ],
  "author": {
    "name": "Camilla Berglund",
    "email": "elmindreda@elmindreda.org",
    "time": "Fri Aug 03 02:57:33 2012 +0200"
  },
  "committer": {
    "name": "Camilla Berglund",
    "email": "elmindreda@elmindreda.org",
    "time": "Fri Aug 03 02:57:33 2012 +0200"
  },
  "message": "Merge branch \u0027master\u0027 into multi-monitor\n\nConflicts:\n\tinclude/GL/glfw3.h\n\tsrc/CMakeLists.txt\n\tsrc/fullscreen.c\n\tsrc/internal.h\n\tsrc/win32_fullscreen.c\n\tsrc/win32_platform.h\n\tsrc/x11_fullscreen.c\n\ttests/modes.c\n",
  "tree_diff": []
}