| commit | 038adea9ad46b39ba6ff76e8806791cbc857040b | |
| author | ygrek <ygrek@autistici.org> | |
| Sat, 29 May 2010 19:22:23 +0000 (29 22:22 +0300) | ||
| committer | ygrek <ygrek@autistici.org> | |
| Sat, 29 May 2010 19:22:23 +0000 (29 22:22 +0300) | ||
| tree | 373ade42b1430791d12be45dcafcf28f6a454494 | treesnapshot (tar.gz zip) |
| parent | 634883966003ad390f33d90074ca9017f724555e | commitdiff |
| parent | 766da56a307caa58a796d8cb41037687d39201ed | commitdiff |
Merge branch 'dev/charset'
Conflicts:
src/networks/direct_connect/dcProtocol.ml
Conflicts:
src/networks/direct_connect/dcProtocol.ml