2 Commits

Author	SHA1	Message	Date
Neil Roberts	bf075fe113	- Update .gitignore ... - Remove dangling conflict marker in ChangeLog-ivan	2008-04-25 14:24:25 +00:00
Neil Roberts	6409b1adeb	Merged clutter-ivan branch into trunk. ... svn merge \ https://svn.o-hand.com/repos/clutter/trunk/clutter@2509 \ https://svn.o-hand.com/repos/clutter/branches/clutter-ivan@HEAD	2008-04-25 13:37:36 +00:00