diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-04 17:48:48 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:48:48 +0000 |
| commit | cd565ae26cc77b1013bcbaacf69cbe994e5d4889 (patch) | |
| tree | 4bdb5150f54ad5dacc2b2758e3aa11b956391111 /util.c | |
| parent | a2f7ddcca9c39008596e8b28624bdfe127656afd (diff) | |
18. Merged in XFree86 code up to 4.4.0 including changes to files that had
a changed license. There was only one change which happened to be from
me (Egbert Eich).
Diffstat (limited to 'util.c')
| -rw-r--r-- | util.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -19,8 +19,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XdotOrg: xc/programs/fonttosfnt/util.c,v 1.11 2003/12/19 02:16:36 dawes Exp $ */ -/* $XFree86: xc/programs/fonttosfnt/util.c,v 1.11 2003/12/19 02:16:36 dawes Exp $ */ +: /* $XdotOrg: xc/programs/fonttosfnt/util.c,v 1.11 2003/12/19 02:16:36 dawes Exp $ */ +/* $XFree86: xc/programs/fonttosfnt/util.c,v 1.10 2003/12/19 02:05:39 dawes Exp $ */ #include <time.h> #include <string.h> |