[PULL] leak fixes

[Keith Packard]

> >>       glx: fix memory leak when destroying screen
> >>       glx: don't leak fbconfigs
> >>       glx: don't leak driConfigs
> >>       Correctly free config file names
> >>       parser: free scandir's list
> >>       parser: free val.str after xf86getBoolValue
> >>       parser: free val.str after xstrtokenize

> I fixed the conflict and updated the repository. Please pull again.

Merged.
   f405dff..873a1ac  master -> master

-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 827 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20111124/2d0f415a/attachment.pgp>