[Monotone-commits-diffs] Revision c827977166895ccc23f5c7098b616e7ae2e1dc50

[monotone]

-----------------------------------------------------------------
Revision: c827977166895ccc23f5c7098b616e7ae2e1dc50
Ancestor: 135daf2a16c656018ee6f3e60fd13544f4ac751b
Ancestor: 17068a80fc01f515d02d7affa545433ab1835b87
Author: Timothy Brownawell  <address@hidden>
Date: 2010-06-09 18.38.19
Branch: net.venge.monotone.connection_info_cleanup

Renamed entries:
        unix/parse_time.cc to unix/parse_date.cc
        win32/parse_time.cc to win32/parse_date.cc
Modified files:
        HACKING Makefile.am NEWS cmd.cc cmd_key_cert.cc cmd_list.cc
        cmd_netsync.cc cmd_packet.cc cmd_ws_commit.cc database.cc
        database.hh dates.cc lua_hooks.cc monotone.texi netsync.cc
        network/connection_info.cc network/connection_info.hh
        network/netsync_session.cc network/session.cc
        outdated_indicator.cc outdated_indicator.hh platform.hh
        po/de.po po/it.po po/pt.po project.cc project.hh
        tests/branch_leaves_sync_bug/__driver__.lua
        tests/log_--diffs/__driver__.lua
        tests/log_--diffs/expect_restrict
        tests/netsync_mtn_uri_scheme/__driver__.lua
        unit-tests/dates.cc unix/parse_date.cc uri.cc uri.hh
        win32/parse_date.cc

ChangeLog: 

merge in mainline changes


monotone --db={your.database} diff 
--revision=135daf2a16c656018ee6f3e60fd13544f4ac751b 
--revision=c827977166895ccc23f5c7098b616e7ae2e1dc50
monotone --db={your.database} diff 
--revision=17068a80fc01f515d02d7affa545433ab1835b87 
--revision=c827977166895ccc23f5c7098b616e7ae2e1dc50
----------------------------------------------------------------------