gio-standalone r750 - in trunk: . gio

[alexl svn gnome org]

Author: alexl
Date: 2007-11-20 14:26:19 +0000 (Tue, 20 Nov 2007)
New Revision: 750
ViewCVS link: http://svn.gnome.org/viewcvs/gio-standalone?rev=750&view=rev

Modified:
   trunk/ChangeLog
   trunk/gio/gfile.c
   trunk/gio/gioerror.h
   trunk/gio/glocalfile.c
Log:
2007-11-20  Alexander Larsson  <alexl redhat com>

        * gio/gfile.c:
        * gio/gioerror.h:
        * gio/glocalfile.c:
	Add G_IO_ERROR_WOULD_MERGE for
	copy/move dir on dir with overwrite.