diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2011-08-20 17:24:02 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2011-08-20 17:24:02 +0100 |
| commit | 8acaed657eb4db47c448c8a582810bf301ff47ef (patch) | |
| tree | 84beca817e796bc28bbb49104656e0bdcf3b264a /debian | |
| parent | 0ae8e6867facf7eb8055533a642026d7c9e9cf38 (diff) | |
| parent | 0789c49b475067e89dcd39ffd2cf11871dcb7e80 (diff) | |
| download | userv-utils-8acaed657eb4db47c448c8a582810bf301ff47ef.tar.gz | |
Merge branch 'zealot'
Conflicts:
.gitignore
ipif/Makefile
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/.cvsignore | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/debian/.cvsignore b/debian/.cvsignore deleted file mode 100644 index 1e64510..0000000 --- a/debian/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -sv-* -tmp -files |