diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-04-17 03:19:17 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-04-17 03:19:17 -0300 |
commit | d246da4bb04eee35189c79c8466c21ff86678e42 (patch) | |
tree | c7167129c67a2d846adcca9245ebae134069aa8a /.gitignore | |
parent | 6ce3ddee58415e052ec578e777994a60c7e4c3a3 (diff) | |
parent | 1ce0c6368d0908e25f9bd1bb8183b5f29053fac8 (diff) |
Merge branch 'master' of https://projects.archlinux.org/git/dbscripts
Conflicts:
db-functions
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,3 +1,3 @@ *~ /config.local -test/packages/*/*.pkg.tar.* +test/packages/*/*.pkg.tar.?z |