diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-04 17:48:51 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:48:51 +0000 |
| commit | 7e6c6da02967371245f908240d0a214e1ae8faf3 (patch) | |
| tree | e6ce9f76eb3e169dff606596811344629fb5333b /mkfontscale.c | |
| parent | c6925d82e4cba98de1119fa910d4e452faae5e67 (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 'mkfontscale.c')
| -rw-r--r-- | mkfontscale.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkfontscale.c b/mkfontscale.c index dce41b6..3c944fa 100644 --- a/mkfontscale.c +++ b/mkfontscale.c @@ -19,8 +19,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XdotOrg: xc/programs/mkfontscale/mkfontscale.c,v 1.1.4.2 2003/12/06 13:24:29 kaleb Exp $ */ -/* $XFree86: xc/programs/mkfontscale/mkfontscale.c,v 1.22 2003/12/19 02:05:39 dawes Exp $ */ +: /* $XdotOrg: xc/programs/mkfontscale/mkfontscale.c,v 1.1.4.2 2003/12/06 13:24:29 kaleb Exp $ */ +/* $XFree86: xc/programs/mkfontscale/mkfontscale.c,v 1.21 2003/12/10 02:58:07 dawes Exp $ */ #include <stdio.h> #include <stdlib.h> |