| 1 |
commit: ff789b04838a22da75ec5510ba38c0f7ebeffbef |
| 2 |
Author: Markus Meier <maekke <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 19 19:45:43 2014 +0000 |
| 4 |
Commit: Markus Meier <maekke <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 19 19:45:43 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=ff789b04 |
| 7 |
|
| 8 |
merge .gitignore files |
| 9 |
|
| 10 |
--- |
| 11 |
.gitignore | 1 + |
| 12 |
scripts/.gitignore | 1 - |
| 13 |
2 files changed, 1 insertion(+), 1 deletion(-) |
| 14 |
|
| 15 |
diff --git a/.gitignore b/.gitignore |
| 16 |
index a01ee28..a86a8d0 100644 |
| 17 |
--- a/.gitignore |
| 18 |
+++ b/.gitignore |
| 19 |
@@ -1 +1,2 @@ |
| 20 |
.*.swp |
| 21 |
+*.txt |
| 22 |
|
| 23 |
diff --git a/scripts/.gitignore b/scripts/.gitignore |
| 24 |
deleted file mode 100644 |
| 25 |
index 2211df6..0000000 |
| 26 |
--- a/scripts/.gitignore |
| 27 |
+++ /dev/null |
| 28 |
@@ -1 +0,0 @@ |
| 29 |
-*.txt |
Archives