Changeset 5992131 for debian/.gitignore

Timestamp:
Jun 28, 2010, 9:47:57 PM (16 years ago)
Author:
Jessica B. Hamrick <jhamrick@…>
Branches:
debian
Children:
f0a1232
Parents:
8120872 (diff), fad0d1b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Jessica B. Hamrick <jhamrick@…> (06/28/10 21:47:57)
git-committer:
Jessica B. Hamrick <jhamrick@…> (06/28/10 21:47:57)
Message:

Merge branch 'master' of github.com:jhamrick/gutenbach into debian

Conflicts:

.gitignore

File:
1 added

Note: See TracChangeset for help on using the changeset viewer.