Changeset 168d3bb for protocols/oscar

Timestamp:
2014-10-05T20:45:20Z (10 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
5cb21d1, c27a923
Parents:
f329dfc (diff), ebe2c5e (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 from dx, fixes two build issues.

(No files)

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