diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-03-10 17:15:08 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-03-10 17:15:08 -0300 |
| commit | abfaf49d82215e1b674123cd9a395fa5ac10bc7b (patch) | |
| tree | 152b1b2604c507febb3725796fbe5c6883724106 /.gitignore | |
| parent | b762e09f6f20c07fccc66325079584213388102d (diff) | |
| parent | 806fe6f8f6664da99f5405af5a831f0e48e3fe64 (diff) | |
Merge remote-tracking branch 'refs/remotes/kali/feature/graph-cpu-and-mem' into develop
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -4,6 +4,7 @@ *.log *.lprof *.pstats +*.data *.*~ .* *_rc.py @@ -33,3 +34,4 @@ config/* CHANGELOG~ data/bitmask.pro +bitmask-resources.png |