[SCM] Samba GTK+ frontends branch, master, updated. f9f96ecf3bc96a6b652e318727de7d9480b3185c

[Jelmer Vernooij]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Samba GTK+ frontends".

The branch, master has been updated
       via  f9f96ecf3bc96a6b652e318727de7d9480b3185c (commit)
       via  7b1640a28a31955b5031758a90d134fb9ed3699e (commit)
      from  5ab89476ddb70e7091e0efe93307fca419e611e5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f9f96ecf3bc96a6b652e318727de7d9480b3185c
Merge: 5ab89476ddb70e7091e0efe93307fca419e611e5 7b1640a28a31955b5031758a90d134fb9ed3699e
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Apr 1 23:40:45 2009 +0200

    Merge branch 'gd'
    
    Conflicts:
    	common/gtk-smb.h
    	common/gtk_events.c
    	common/select.c
    	tools/gepdump.c
    	tools/gregedit.c
    	tools/gwsam.c

-----------------------------------------------------------------------

Summary of changes:
 common/gtk-smb.h    |    8 ++++++--
 common/gtk_events.c |   14 ++++++++++----
 common/select.c     |   10 +++++++---
 tools/gwsam.c       |   14 +++++++++-----
 4 files changed, 32 insertions(+), 14 deletions(-)


hooks/post-receive
--
Samba GTK+ frontends