diff options
| author | Manoj Srivastava <srivasta@debian.org> | 2016-01-27 12:43:59 -0800 |
|---|---|---|
| committer | Manoj Srivastava <srivasta@debian.org> | 2016-01-27 12:50:09 -0800 |
| commit | 76fce162659078323fcd5e54b3195dae371faca2 (patch) | |
| tree | c1d93d415b96238aae3c54eb83cb0815af2e4bca /src/.gitignore | |
| parent | b4456969cd02d75c599a5b86b225c0774697e85d (diff) | |
| parent | 4aa1a39402c3908e9e8b6eb3fd4e2183d5e5c52e (diff) | |
Merge branch 'development' into upstream
Signed-off-by: Manoj Srivastava <srivasta@debian.org>
# Conflicts:
# src/.gitignore
# src/maid-x11.c
# src/quest.pkg
Diffstat (limited to 'src/.gitignore')
| -rw-r--r-- | src/.gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/.gitignore b/src/.gitignore new file mode 100644 index 00000000..098f3b10 --- /dev/null +++ b/src/.gitignore @@ -0,0 +1,3 @@ +/harness +/tome +*.plist |