Merge branch 'inc-sven'
commitdd28f6c87e81da859470b225d983af412e0b91c1
authorMikael Hallendal <micke@imendio.com>
Thu, 8 Feb 2007 13:57:24 +0000 (8 14:57 +0100)
committerMikael Hallendal <micke@imendio.com>
Thu, 8 Feb 2007 13:57:24 +0000 (8 14:57 +0100)
tree67dfffbf5c4496b06db728a4745931957c434cb3
parentd7bc3c0540ff0acaef1eace499008d1d8c97eadd
parentca0917bed0ce490d3f297ea97ad76ac3f4231c77
Merge branch 'inc-sven'
src/giggle-window.c