diff options
author | Hanoh Haim <hhaim@cisco.com> | 2015-09-10 07:54:05 +0300 |
---|---|---|
committer | Hanoh Haim <hhaim@cisco.com> | 2015-09-10 07:54:05 +0300 |
commit | a360a1734c459d62bd4c204a6005214ce8944f85 (patch) | |
tree | e06cad6cf63a52701aff303c19024cde1d541ebd /linux | |
parent | 15b4f7cd7c3e9176c1f24fc632791e833cb588b8 (diff) | |
parent | e33befcf222fd2108d589dede11069d4256bb21a (diff) |
Merge branch 'master' of csi-sceasr-b45:/auto/proj-pcube-b/apps/PL-b/tools/repo//trex-core
Conflicts:
linux/ws_main.py
Diffstat (limited to 'linux')
-rwxr-xr-x | linux/ws_main.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linux/ws_main.py b/linux/ws_main.py index 4a1031ca..0da4ca2b 100755 --- a/linux/ws_main.py +++ b/linux/ws_main.py @@ -143,6 +143,7 @@ net_src = SrcGroup(dir='src/common/Network/Packet', # stateless code stateless_src = SrcGroup(dir='src/stateless/', src_list=['trex_stream.cpp', + 'trex_stream_vm.cpp', 'trex_stateless.cpp', ]) # RPC code |