[ovs-git] Open vSwitch: ofproto: Fix merge error from commit e20567b044. (wdp)

dev at openvswitch.org dev at openvswitch.org
Thu Sep 2 18:12:28 UTC 2010


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 "Open vSwitch".

The branch, wdp has been updated
       via  e9ec7451755a50449811738b5a0adad49a864fe3 (commit)
      from  d90c986fefa7f171b49e9130dad7d7b9c943ee58 (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 e9ec7451755a50449811738b5a0adad49a864fe3
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=e9ec7451755a50449811738b5a0adad49a864fe3
Author: Tom Everman <teverman at google.com>
		
ofproto: Fix merge error from commit e20567b044.
		


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

Summary of changes:
 ofproto/ofproto.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Open vSwitch




More information about the git mailing list