diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:13 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:13 +0000 |
| commit | 22c7560ce8835074d16eb9568213532338a07a7c (patch) | |
| tree | dfe3e8e99201bdbe550e0565ce290056d73609f8 /fonttosfnt.h | |
| parent | a2f7ddcca9c39008596e8b28624bdfe127656afd (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASE
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
future conflicts on ASCII but not humal readable files. (There should
probably be separate CreditsXorg.rtf files) (Egbert Eich).
Diffstat (limited to 'fonttosfnt.h')
| -rw-r--r-- | fonttosfnt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fonttosfnt.h b/fonttosfnt.h index 128d2cc..b7392a7 100644 --- a/fonttosfnt.h +++ b/fonttosfnt.h @@ -19,7 +19,7 @@ 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. */ -/* $XFree86: xc/programs/fonttosfnt/fonttosfnt.h,v 1.5 2003/11/21 05:22:09 dawes Exp $ */ +/* $XFree86: xc/programs/fonttosfnt/fonttosfnt.h,v 1.4 2003/10/24 20:38:11 tsi Exp $ */ #ifndef _FONTTOSFNT_H_ #define _FONTTOSFNT_H_ 1 |