Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-18 22:26:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'android_branch' into toolbar

Browse source
This commit is contained in:
eehouse@eehouse.org 2010-07-07 20:44:33 -07:00 committed by Andy2
commit 586e0d25f9
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/relay/Makefile
View file

@ -32,7 +32,7 @@ SRC = xwrelay.cpp \
# STATIC ?= -static
GITINFO = gitversion.txt
HASH=$(shell ../scripts/gitversion.sh)
HASH=$(shell git describe)
OBJ = $(patsubst %.cpp,%.o,$(SRC))
#LDFLAGS += -pthread -g -lmcheck $(STATIC)

2
xwords4/relay/ctrl.cpp
View file

@ -522,7 +522,7 @@ cmd_lock( int socket, const char** args )
static bool
cmd_help( int socket, const char** args )
{
if ( 0 == strcmp( "help", args[1] ) ) {
if ( NULL != args[1] && 0 == strcmp( "help", args[1] ) ) {
print_to_sock( socket, true, "* %s -- prints this", args[0] );
} else {