[Monotone-commits-diffs] Revision 26eaf23c95710d1f968c2a66861e05141a8f1211

[monotone]

-----------------------------------------------------------------
Revision: 26eaf23c95710d1f968c2a66861e05141a8f1211
Ancestor: c1ecd7812128f6a8273e385562ca831a6c1b2c47
Ancestor: f6f15f55bfcb36865592ac2c10df58ff27430664
Author: address@hidden
Date: 2006-03-11T21:21:27
Branch: net.venge.monotone

Modified files:
        ChangeLog m4/prog_cxx_warnings.m4 netxx/peer.cxx
        netxx/sockaddr.cxx netxx/sockaddr.h po/fr.po

ChangeLog: 

merge of c1ecd7812128f6a8273e385562ca831a6c1b2c47
     and f6f15f55bfcb36865592ac2c10df58ff27430664


monotone --db={your.database} diff 
--revision=c1ecd7812128f6a8273e385562ca831a6c1b2c47 
--revision=26eaf23c95710d1f968c2a66861e05141a8f1211
monotone --db={your.database} diff 
--revision=f6f15f55bfcb36865592ac2c10df58ff27430664 
--revision=26eaf23c95710d1f968c2a66861e05141a8f1211
----------------------------------------------------------------------