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

Merge branch 'master' of github.com:FreeRDP/FreeRDP

Browse Source
This commit is contained in:
Marc-André Moreau 2012-11-12 20:49:20 -05:00
commit 82725a2df7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
channels/smartcard/client/CMakeLists.txt
View File

@ -21,7 +21,7 @@ set(${MODULE_PREFIX}_SRCS
scard_main.c scard_main.c
scard_operations.c) scard_operations.c)
include_directories(${PCSC_INCLUDE_DIRS}) include_directories(${PCSC_INCLUDE_DIR})
add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DeviceServiceEntry") add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DeviceServiceEntry")

8
client/X11/xfreerdp.1.xml
View File

@ -372,10 +372,10 @@
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term>--gdi</term> <term>--gdi <replaceable class="parameter">backend</replaceable></term>
<listitem> <listitem>
<para> <para>
GDI rendering backend. <replaceable class="parameter">backend</replaceable> can be either sw (software) or hw (hardware). GDI (Graphics Device Interface) rendering backend. <replaceable class="parameter">backend</replaceable> can be either sw (software) or hw (hardware).
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -459,10 +459,10 @@
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term>--plugin</term> <term>--plugin <replaceable class="parameter">pluginname</replaceable></term>
<listitem> <listitem>
<para> <para>
load a plugin load <replaceable class="parameter">pluginname</replaceable>
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>

2
libfreerdp/utils/args.c
View File

@ -134,7 +134,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
"\n" "\n"
"Usage: %s [file] [options] server:port\n" "Usage: %s [file] [options] server:port\n"
" -0: connect to console session\n" " -0: connect to console session\n"
" -a: set color depth in bit, default is 16\n" " -a: set color depth in bits, default is 16\n"
" -c: shell working directory\n" " -c: shell working directory\n"
" -D: hide window decorations\n" " -D: hide window decorations\n"
" -T: window title\n" " -T: window title\n"