Merge branch 'fix-defined-twice-error-on-empty-struct' into staging
commitc30df9be78778eacb19b30e7bf903236f6116ee0
authorJosh Triplett <josh@freedesktop.org>
Tue, 17 Oct 2006 04:46:15 +0000 (16 21:46 -0700)
committerJosh Triplett <josh@freedesktop.org>
Tue, 17 Oct 2006 04:46:15 +0000 (16 21:46 -0700)
tree5c7984b7e51f09d2a48a64bb58df886b705b53e7
parent7fdd2a497b8962b15d54b54b412380fb024767ed
parent8aed19aea597dd467e0de3402ed7e6feae70394c
Merge branch 'fix-defined-twice-error-on-empty-struct' into staging
expand.c