[Libreoffice-commits] core.git: Changes to 'private/moggi/windows-blacklist'

[Markus Mohrhard]

New branch 'private/moggi/windows-blacklist' available with the following commits:
commit 94d91cd2400fcbbd840c07a866aa2ee6ca570270
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Mon Nov 24 16:46:15 2014 +0100

    WIP: implement windows OpenGL blacklist, first step
    
    Change-Id: I408b76855693c64473dba3bb3fa94374fff01fae

commit bbed8bb7dc735539be2dc782f2fe23dead0901d1
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Mon Nov 24 00:24:44 2014 +0100

    Revert "Revert "Revert "Revert "wrong merge conflict resolution, vcldemo, icontest go to instdir""""
    
    This reverts commit bf9435bce063da95deb8a52371bce04e7435c966.