diff options
| author |   imarom <imarom@cisco.com> | 2015-08-30 11:41:42 +0300 |
|---|---|---|
| committer | imarom <imarom@cisco.com> | 2015-08-30 11:41:42 +0300 |
| commit | c9381643e7bf9b3dc690bf3e012ad6176ee32b8c (patch) | |
| tree | ff0e91ee5c38f2caaeaa53340ecf2db2a326455a /CONTRIBUTORS | |
| parent | 05a529031e962d61ab977393fb3d153931feff34 (diff) | |
| parent | 53f0e28d7f30c7175cbb15884c309613593859d8 (diff) | |
Merge branch 'master' into rpc
Conflicts:
linux/ws_main.py
linux_dpdk/ws_main.py
Diffstat (limited to 'CONTRIBUTORS')
| -rwxr-xr-x | CONTRIBUTORS | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 06929302..57d19820 100755 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1,5 +1,5 @@ -Hanoh haim -Dave Johnson -Wenxian Li -Dan Klein - +Hanoh haim +Dave Johnson +Wenxian Li +Dan Klein +Itay Marom |