diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:23 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:23 +0000 |
| commit | f5c1c2f13cc7c19d81cd8b2f2ed6150e3bb5f37f (patch) | |
| tree | a106c3a319e07298a4abd20257a044dcffc7e78a /ULabel.c | |
| parent | fbd548db7345a323d1d1f6948aed89b130b6b36d (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.before_20040421_xprint_branch_landingXORG-CURRENT-premerge-release-1XORG-CURRENT-CLOSEDXACE-SELINUX-BASEDAMAGE-XFIXES-BASEXORG-CURRENTXACE-SELINUXDAMAGE-XFIXES
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 'ULabel.c')
| -rw-r--r-- | ULabel.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -47,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/xfontsel/ULabel.c,v 1.4 2003/10/24 20:38:18 tsi Exp $ */ +/* $XFree86: xc/programs/xfontsel/ULabel.c,v 1.3tsi Exp $ */ /* * ULabel.c - UCSLabel widget |