diff options
| author | max <max@tclers.tk> | 2011-08-04 14:03:59 (GMT) |
|---|---|---|
| committer | max <max@tclers.tk> | 2011-08-04 14:03:59 (GMT) |
| commit | 2d023b4b58bc316adcf9e9721273392145c60fc2 (patch) | |
| tree | a86216133aa88b71bb1a3bd0b1a3d15e819b189e /ChangeLog | |
| parent | 277d2c7075ce7dee345ae755f48675378a04edc2 (diff) | |
| download | tcl-2d023b4b58bc316adcf9e9721273392145c60fc2.zip tcl-2d023b4b58bc316adcf9e9721273392145c60fc2.tar.gz tcl-2d023b4b58bc316adcf9e9721273392145c60fc2.tar.bz2 | |
Don't use AI_ADDRCONFIG for now. It seems to do more harm than good.
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 12 |
1 files changed, 12 insertions, 0 deletions
@@ -1,3 +1,14 @@ +<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<< +2011-08-04 Reinhard Max <max@suse.de> + + * generic/tclIOSock.c (TclCreateSocketAddress): Don't bother using + AI_ADDRCONFIG for now, as it was causing problems in various + situations. + +2011-08-02 Don Porter <dgp@users.sourceforge.net> +======= COMMON ANCESTOR content follows ============================ +2011-08-02 Don Porter <dgp@users.sourceforge.net> +======= MERGED IN content follows ================================== 2011-08-04 Donal K. Fellows <dkf@users.sf.net> * generic/tclAssembly.c (AssembleOneLine, GetBooleanOperand) @@ -9,6 +20,7 @@ tests. 2011-08-02 Don Porter <dgp@users.sourceforge.net> +>>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> * changes: Updates for 8.6b2 release. * tools/tcltk-man2html.tcl: Variable substitution botch. |