commit | 585cbb77803a1526b0b55a754f693f30944e53a8 | [log] [tgz] |
---|---|---|
author | Pavlin Radoslavov <pavlin@onlab.us> | Thu Dec 12 16:14:02 2013 -0800 |
committer | Pavlin Radoslavov <pavlin@onlab.us> | Thu Dec 12 16:14:02 2013 -0800 |
tree | 69af391b7fac736b4cdbfdff205d64af72d846af | |
parent | d3df1980ffdd1adb0f05bccdc8371c48ab238067 [diff] | |
parent | ff08e547fb4597746f8c95809a3e06811acf6da6 [diff] |
Merge branch 'master' of https://github.com/OPENNETWORKINGLAB/ONOS
diff --git a/.gitignore b/.gitignore index dd8d359..7e971f7 100644 --- a/.gitignore +++ b/.gitignore
@@ -3,6 +3,7 @@ .classpath .project .pydevproject +.settings target onos-logs onos.log