fixing commited conflict due to interrupted commit
authorØyvind Kolås <pippin@openedhand.com>
Thu, 15 Nov 2007 17:34:49 +0000 (17:34 +0000)
committerØyvind Kolås <pippin@openedhand.com>
Thu, 15 Nov 2007 17:34:49 +0000 (17:34 +0000)
commitd060b3bdd77ae18b8b1c5027b97be149ebaaad79
tree38e9444a673b173f337a88df75c9bb71d249cfb4
parent36c61894056d5a97317dea45e74266a5ca08b1a6
fixing commited conflict due to interrupted commit
clutter/clutter-main.c