merged. 7b3aa3f..268eb96 server-1.15-branch -> server-1.15-branch
On 06/05/2014 09:37 PM, Jeremy Huddleston Sequoia wrote: > In addition to the XQuartz cherry-picks, this includes the fbGlyphs origin > fix as well. > > --- > > The following changes since commit 7b3aa3f0be8d1334dbf23bd04258a8856a4329c7: > > XQuartz: Ensure we wait for the server thread to terminate (2014-04-14 > 18:48:39 -0600) > > are available in the git repository at: > > git://people.freedesktop.org/~jeremyhu/xserver server-1.15-branch > > for you to fetch changes up to 268eb961c9c58fc7cc26e514661b5f8304c1c08f: > > XQuartz: Update logic to account for title bar on every display in > Mavericks (2014-05-31 17:50:41 -0700) > > ---------------------------------------------------------------- > Jeremy Huddleston Sequoia (3): > XQuartz: Bump to 2.7.7 > XQuartz: Dead code removal (ENABLE_DEBUG_LOG) > XQuartz: Update logic to account for title bar on every display in > Mavericks > > Peter Harris (1): > fb: Fix origin of source picture in fbGlyphs > > fb/fbpict.c | 2 +- > hw/xquartz/bundle/Info.plist.cpp | 4 ++-- > hw/xquartz/darwin.c | 16 ---------------- > hw/xquartz/xpr/xprScreen.c | 16 +++++++++++++--- > 4 files changed, 16 insertions(+), 22 deletions(-) > -- Matt Dew <[email protected]> Key signature: 0xF7C3 BEC3 Fingerprint: FDB1 9D94 C573 DC29 BCCB 2F9F A6BF 3771 F7C3 BEC3
signature.asc
Description: OpenPGP digital signature
_______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
