mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve merge error, remove debugging code

Browse Source
This commit is contained in:
Jim Grandy 2012-06-27 10:14:06 -07:00
parent cc2fdd6da2
commit b8c0d4e772
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/Mac/MRDPView.m
View File

@ -34,7 +34,8 @@
#import "MRDPView.h"
#import "MRDPCursor.h"
#define RUN_IN_XCODE
// Should be defined in Makefile
// #define RUN_IN_XCODE
// LK_TODO
#define GOT_HERE //printf("### got here: %s : %s() : %d\n", __FILE__, __func__, __LINE__)
@ -1869,7 +1870,6 @@ void cliprdr_send_supported_format_list(freerdp *inst)
freerdp_channels_send_event(inst->context->channels, (RDP_EVENT*) event);
}
<<<<<<< HEAD
/****************************************************************************************
* *
* *