diff options
| author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-04-16 00:44:41 -0500 |
|---|---|---|
| committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-04-16 00:44:41 -0500 |
| commit | 7203e2e2631e29a79f4ea822c371d4e12c9c1a88 (patch) | |
| tree | f0ada9061babb0f656afa90e438bba0f0f781241 /.gitignore | |
| parent | deab65fad4ced009fb31f7033b1db8ef0af78aee (diff) | |
| parent | 229a9c504cbd733c93cf91399dc54bedf5160cc5 (diff) | |
Merge branch 'master' of ~/packages/dbscripts into prueba
Conflicts:
.gitignore
db-functions
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1,3 +1,5 @@ *~ *.pyc local_config +/config.local +test/packages/*/*.pkg.tar.* |