projects / pingpong.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d74e05e 9090e55)
Merge branch 'master' of https://github.uci.edu/rtrimana/smart_home_traffic
authorJanus Varmarken <varmarken@gmail.com>
Fri, 4 May 2018 08:17:16 +0000 (01:17 -0700)
committerJanus Varmarken <varmarken@gmail.com>
Fri, 4 May 2018 08:17:16 +0000 (01:17 -0700)
commit09cc04baac94b3eb0acafb1f0d5db2447a54c1f4
tree9fe5cc6b302583041f6caf45f6222a651407597atree | snapshot
parentd74e05e339843d2c2c57518268aa5669f5a51887commit | diff
parent9090e55e333dc790a12346485c7448b7d22ae3c7commit | diff
Merge branch 'master' of https://github.uci.edu/rtrimana/smart_home_traffic

# Conflicts:
# Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/FlowPatternFinder.java
# Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java
Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java diff1 | diff2 | blob | history
PingPong 1.0: packet-level signatures extractor and detector.