Changeset 271d1f96 for .gitignore


Ignore:
Timestamp:
Jun 4, 2011, 8:28:21 AM (13 years ago)
Author:
Joe Ciccone <jciccone@…>
Children:
193eb68
Parents:
0230c0a (diff), 622df7bc (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.
Message:

Merge branch 'master' into simp

Conflicts:

BOOK/Makefile

File:
1 edited

Legend:

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