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 /libXaw/src/Actions.c | |
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 'libXaw/src/Actions.c')
-rw-r--r-- | libXaw/src/Actions.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libXaw/src/Actions.c b/libXaw/src/Actions.c index 3a444b82b..cec9bdd5e 100644 --- a/libXaw/src/Actions.c +++ b/libXaw/src/Actions.c @@ -41,9 +41,6 @@ #include <X11/Xfuncs.h> #include "Private.h" -#ifdef __UNIXOS2__ -static char dummy; -#endif #ifndef OLDXAW |