Comparison

util-src/encodings.c @ 490:9087f39b4222

Another automatic merge, this gets annoying."
author Tobias Markmann <tm@ayena.de>
date Sat, 29 Nov 2008 22:11:21 +0100
parent 474:666e22848890
child 520:e96ac4bb6dd8
comparison
equal deleted inserted replaced
488:328135f63ea3 490:9087f39b4222