summaryrefslogtreecommitdiff
path: root/fonttosfnt.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-04 17:48:48 +0000
committerEgbert Eich <eich@suse.de>2004-03-04 17:48:48 +0000
commitcd565ae26cc77b1013bcbaacf69cbe994e5d4889 (patch)
tree4bdb5150f54ad5dacc2b2758e3aa11b956391111 /fonttosfnt.c
parenta2f7ddcca9c39008596e8b28624bdfe127656afd (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 'fonttosfnt.c')
-rw-r--r--fonttosfnt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fonttosfnt.c b/fonttosfnt.c
index ccdb4bb..62d7601 100644
--- a/fonttosfnt.c
+++ b/fonttosfnt.c
@@ -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/fonttosfnt.c,v 1.4 2003/12/19 02:16:36 dawes Exp $ */
-/* $XFree86: xc/programs/fonttosfnt/fonttosfnt.c,v 1.4 2003/12/19 02:16:36 dawes Exp $ */
+: /* $XdotOrg: xc/programs/fonttosfnt/fonttosfnt.c,v 1.4 2003/12/19 02:16:36 dawes Exp $ */
+/* $XFree86: xc/programs/fonttosfnt/fonttosfnt.c,v 1.3 2003/07/08 15:39:49 tsi Exp $ */
#include <stdio.h>
#include <stdlib.h>