| commit | 23c6def880f0eae6e318a2fb083072b68778d245 | [log] [tgz] |
|---|---|---|
| author | Camilla Berglund <elmindreda@elmindreda.org> | Sun Dec 30 22:18:15 2012 +0100 |
| committer | Camilla Berglund <elmindreda@elmindreda.org> | Sun Dec 30 22:18:15 2012 +0100 |
| tree | 09528171e2c0ff43be1c4212cd94a8dd65032853 | |
| parent | 20af66f271a8aca9e3c2fde8cefd56f045b5606b [diff] | |
| parent | 9e9457767f3d1c2dd0a5b85191c36f1648f7c0bb [diff] |
Merge branch 'master' into multi-monitor Conflicts: src/cocoa_window.m src/init.c tests/iconify.c tests/reopen.c