-
Halla Rempt authored
commit 8fd90a3dcbe35f7bb26f8f63dddf2fd2a74b49a4 Merge: 92bc3a5 be195b7 Author: Boudewijn Rempt <boud@valdyas.org> Date: Sun Sep 22 22:22:47 2013 +0200 Merge remote-tracking branch 'origin/master' into krita-opengl2-rempt commit 92bc3a58c6f80433885f12a6305c69adf42122ef Author: Sven Langkamp <sven.langkamp@gmail.com> Date: Sun Sep 22 15:16:26 2013 +0200 Workaround for flickering in OpenGL 2 canvas on AMD graphic cards BUG:322808 REVIEW:112883 commit 8c5ec1b0d1723814a56ac028296fef93d0e620fa Merge: 94287d6 ec9b97a Author: Boudewijn Rempt <boud@valdyas.org> Date: Fri Sep 20 08:52:16 2013 +0200 Merge branch 'master' into krita-opengl2-rempt Conflicts: krita/ui/tool/kis_tool_freehand.cc commit 94287d69187c6de85c1fb52c1dbd0105f8b732ea Merge: 83f300d 4c7b0a9 Author: Boudewijn Rempt <boud@valdyas.org> Date: Thu Sep 19 15:55:36 2013 +0200 Merge branch 'master' into krita-opengl2-rempt commit 83f300d5a7b57d4be2fec91349c4dfb886522bc9 M...
afb80e69