Timestamp:
2015-04-06T17:07:03Z (10 years ago)
Author:
dequis <dx@…>
Children:
1aacef41
Parents:
b3ebb3a (diff), a9b1e0e (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 'develop' into feat/hip-cat

Conflicts:

irc.h
irc_channel.c

(No files)

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