Merge branch 'master' of github.com:intel-ethernet/Open-AVB
authorintel-ethernet <eric_mann@mail.intel.com>
Thu, 13 Jun 2013 03:04:13 +0000 (20:04 -0700)
committerintel-ethernet <eric_mann@mail.intel.com>
Thu, 13 Jun 2013 03:04:13 +0000 (20:04 -0700)
commit08edb115c441f3312feab6b115a0e3684a989632
tree55bccee4b624ca858c6b34e5402eeb45066fa658
parent7da028f82b3043adccbf231819180b8e8e5a165c
parent135b61f510f42b9f00dd241be0cc73cf0e51a520
Merge branch 'master' of github.com:intel-ethernet/Open-AVB

Conflicts:
daemons/gptp/windows/daemon_cl/daemon_cl.vcxproj
daemons/gptp/windows/daemon_cl/daemon_cl.vcxproj