diff options
author | Egbert Eich <eich@suse.de> | 2004-03-04 17:46:24 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:46:24 +0000 |
commit | b16fb21849e055327d1d106c5277f4a34875e18b (patch) | |
tree | af843d4d3fe4414c5a60690200d9fba9dbf229d4 | |
parent | 5c4753f11a817e968bff5a85942ff47d38562c20 (diff) | |
download | xorg-proto-kbproto-XORG-RELEASE-1-TM.tar.gz |
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadxo-6_7_0XPRINT_BEGINXPRINT_BASEXORG-TM-CYGWIN-MERGEXORG-TM-CYGWIN-LAST-MERGEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-CLOSEDXORG-RELEASE-1-TM-BASEXORG-RELEASE-1-STSF-FORKXORG-RELEASE-1-MERGEXORG-CYGWIN-MERGEXORG-CYGWIN-LAST-MERGEXORG-6_7_0IPv6-REVIEW-BASEXPRINTXORG-RELEASE-1-TMXORG-RELEASE-1-STSFXORG-RELEASE-1IPv6-REVIEW
a changed license. There was only one change which happened to be from
me (Egbert Eich).
-rw-r--r-- | XKB.h | 2 | ||||
-rw-r--r-- | XKBgeom.h | 2 | ||||
-rw-r--r-- | XKBsrv.h | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/include/extensions/XKB.h,v 1.6 2003/12/22 17:48:02 tsi Exp $ */ +/* $XFree86: xc/include/extensions/XKB.h,v 1.5tsi Exp $ */ #ifndef _XKB_H_ #define _XKB_H_ @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/include/extensions/XKBgeom.h,v 3.10 2003/11/17 22:20:02 dawes Exp $ */ +/* $XFree86: xc/include/extensions/XKBgeom.h,v 3.9 2002/09/18 17:11:40 tsi Exp $ */ #ifndef _XKBGEOM_H_ #define _XKBGEOM_H_ @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/include/extensions/XKBsrv.h,v 3.23 2003/11/17 22:20:02 dawes Exp $ */ +/* $XFree86: xc/include/extensions/XKBsrv.h,v 3.22 2002/11/20 04:49:01 dawes Exp $ */ #ifndef _XKBSRV_H_ #define _XKBSRV_H_ |