Changeset c2ee85c for protocols


Ignore:
Timestamp:
2006-05-16T21:21:34Z (19 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
ac83732
Parents:
af9980f (diff), 85cf37f (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 main tree.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • protocols/Makefile

    raf9980f rc2ee85c  
    1010
    1111# [SH] Program variables
    12 objects = events_libevent.o http_client.o md5.o nogaim.o proxy.o sha.o $(SSL_CLIENT)
    13 #objects = events_glib.o http_client.o md5.o nogaim.o proxy.o sha.o $(SSL_CLIENT)
     12objects = $(EVENT_HANDLER) http_client.o md5.o nogaim.o proxy.o sha.o $(SSL_CLIENT)
    1413
    1514# [SH] The next two lines should contain the directory name (in $(subdirs))
Note: See TracChangeset for help on using the changeset viewer.