summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2009-02-20 19:20:26 (GMT)
committerJames Meyer <james.meyer@operamail.com>2009-02-20 19:20:26 (GMT)
commit4f7dc32892bc30b0a9d96ccb835732e8ec93d068 (patch)
treea04dd8b73e142a3b44e48e295fa0c0b856658e6b /.gitignore
parentfb738dcd97003951d354d981b2062602de63c649 (diff)
parent4fb9b4e5fbf9dbf9d4ed494318a27116dd17d8e1 (diff)
downloadlinhes_pkgbuild-4f7dc32892bc30b0a9d96ccb835732e8ec93d068.zip
linhes_pkgbuild-4f7dc32892bc30b0a9d96ccb835732e8ec93d068.tar.gz
linhes_pkgbuild-4f7dc32892bc30b0a9d96ccb835732e8ec93d068.tar.bz2
Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD.git
Conflicts: abs/core-testing/tweaker/bin/twk_general.pl Fix merge conflicts
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions