projects / platform / upstream / evolution-data-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ee9ee5 00af456)
Merge branch 'camel-socks-proxy-master'
authorFederico Mena Quintero <federico@novell.com>
Tue, 14 Sep 2010 20:20:11 +0000 (15:20 -0500)
committerFederico Mena Quintero <federico@novell.com>
Tue, 14 Sep 2010 20:20:11 +0000 (15:20 -0500)
1  2 
camel/camel-tcp-stream-raw.c patch | diff1 | diff2 | blob | history

diff --cc camel/camel-tcp-stream-raw.c
Simple merge
Domain: Service Framework / Uncategorized;