Changeset 3d952b5 for Makefile


Ignore:
Timestamp:
2011-07-31T22:59:42Z (11 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
5f1e78d, d6b6906
Parents:
c8b8c83 (diff), f1cf01c (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:

Merging OTR fixes from pesco. Fixes #690 and possibly others.

File:
1 edited

Legend:

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