merge branch 'more-warning-flags' into staging and fix conflicts
commitc81e400f7ffc98231265974da25d12e3c57125ed
authorJosh Triplett <josh@freedesktop.org>
Tue, 17 Oct 2006 04:52:13 +0000 (16 21:52 -0700)
committerJosh Triplett <josh@freedesktop.org>
Tue, 17 Oct 2006 04:54:08 +0000 (16 21:54 -0700)
tree087bd6f6a0ebc5ac071622af6b83eaa53ff388f7
parentb0c064e7c7c1a94640090c00d8028ceafae9fe30
parent6ab5eb55d19bb27798c6340215b3c0f039710a18
merge branch 'more-warning-flags' into staging and fix conflicts
lib.c
lib.h