Differences From Artifact [deba3fa65f]:

• File src/merge3.c — part of check-in [43631b087b] at 2012-03-18 23:44:08 on branch trunk — Fix compiler warnings and update custom makefile. (user: mistachkin size: 14661) [more...]

To Artifact [61acc9c0f2]:

• File src/merge3.c — part of check-in [9f6abc5968] at 2012-08-29 13:57:22 on branch msvc-broken — Allow UTF-8 characters in sources. translate.exe will translate it to ASCII (user: jan.nijtmans size: 14660) [more...]

1
2

3
4
5
6
7
8
9

1

2
3
4
5
6
7
8
9

-
+

/*
** Copyright (c) 2007 D. Richard Hipp
** Copyright © 2007 D. Richard Hipp
**
** This program is free software; you can redistribute it and/or
** modify it under the terms of the Simplified BSD License (also
** known as the "2-Clause License" or "FreeBSD License".)

** This program is distributed in the hope that it will be useful,
** but without any warranty; without even the implied warranty of