diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-01 12:33:20 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-01 12:33:20 +0200 |
| commit | be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779 (patch) | |
| tree | 807b5640d1fedc88ddcda752f101ffdb3071092a /libXfont/include/X11/fonts/fontmisc.h | |
| parent | 11b60c4ebaf348b01051bfff19f947b073028a99 (diff) | |
| parent | 6dd755aa923291db2501cc5c22e409c41a70e3c1 (diff) | |
| download | vcxsrv-be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779.tar.gz vcxsrv-be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779.tar.bz2 vcxsrv-be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Update following packages:
Conflicts:
X11/Xwinsock.h
apps/xhost/xhost.c
libXaw/src/Vendor.c
libXfont/include/X11/fonts/bdfint.h
libXfont/src/fontfile/catalogue.c
Diffstat (limited to 'libXfont/include/X11/fonts/fontmisc.h')
| -rw-r--r-- | libXfont/include/X11/fonts/fontmisc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libXfont/include/X11/fonts/fontmisc.h b/libXfont/include/X11/fonts/fontmisc.h index a1cce67f2..73a824789 100644 --- a/libXfont/include/X11/fonts/fontmisc.h +++ b/libXfont/include/X11/fonts/fontmisc.h @@ -81,11 +81,11 @@ FourByteSwap( extern int RepadBitmap ( - char*, char*, - unsigned, + char*, + unsigned, unsigned, - int, + int, int ); |