summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:neutrinolabs/xrdpLaxmikant Rashinkar2013-06-2710-44/+163
|\
| * xup: from Marc, added missing bgcolorJay Sorg2013-06-271-0/+5
| * work on neutrinordp proxy, cursor and glyphJay Sorg2013-06-232-29/+100
| * libxrdp: no logic change, warnings and code cleanupJay Sorg2013-06-232-13/+19
| * chansrv: no logic change, EOL and coding style cleanupJay Sorg2013-06-232-18/+24
| * Merge pull request #81 from luv/masterjsorg712013-06-233-0/+26
| |\
| | * Revert "Fix path to config.c in sesman/tools/Makefile.am"Lukas Vacek2013-06-221-1/+1
| | * Fix sound and clipboard crashesLukas Vacek2013-06-223-0/+26
| | * Fix path to config.c in sesman/tools/Makefile.amLukas Vacek2013-06-221-1/+1
| |/
| * Merge pull request #80 from neutrinolabs/masterjsorg712013-06-2113-35/+505
| |\
| | * sesman: pid string match xrdp lengthJay Sorg2013-06-191-2/+2
| | * sesman: fix for reading pid fileJay Sorg2013-06-191-0/+1
| | * X11rdp: added install to makefileJay Sorg2013-06-181-0/+4
| * | Merge pull request #79 from neutrinolabs/masterjsorg712013-06-12139-557/+372
| |\ \
| * \ \ Merge pull request #74 from neutrinolabs/masterjsorg712013-06-0810-12/+94
| |\ \ \
* | | | | vrplayer: pause video during window move and resizeLaxmikant Rashinkar2013-06-272-10/+94
| |_|_|/ |/| | |
* | | | Merge branch 'master' of github.com:neutrinolabs/xrdpLaxmikant Rashinkar2013-06-157-5/+459
|\ \ \ \
| * | | | X11rdp: work on xv, still off by defaultJay Sorg2013-06-152-5/+12
| * | | | X11rdp: work on xvJay Sorg2013-06-143-6/+224
| * | | | X11rdp: added rdpxv.cJay Sorg2013-06-131-0/+228
| | |_|/ | |/| |
| * | | replace macro AM_CONFIG_HEADER with AC_CONFIG_HEADERSJay Sorg2013-06-121-1/+1
| * | | X11rdp: update to pixman 0.30Jay Sorg2013-06-112-3/+4
* | | | vrplayer: added feature to automatically restart media on end of streamLaxmikant Rashinkar2013-06-158-32/+44
|/ / /
* | | Merge branch 'master' of github.com:neutrinolabs/xrdpLaxmikant Rashinkar2013-06-08172-403/+942
|\ \ \
| * | | copyright year updateJay Sorg2013-06-08132-143/+143
| | |/ | |/|
| * | X11rdp: log client cursor capsJay Sorg2013-06-081-0/+8
| * | enable new_cursors xrdp.ini settingJay Sorg2013-06-081-0/+8
| * | adding xrdp.ini option to turn off new cursorsJay Sorg2013-06-074-2/+8
| * | Merge remote-tracking branch 'xrdp-org/master'Jay Sorg2013-06-064-4/+33
| |\ \ | | |/
| | * pulse: change some errors to debugJay Sorg2013-06-061-3/+2
| | * more pulse notesJay Sorg2013-06-062-0/+27
| | * X11rdp: fix for buildx.shJay Sorg2013-06-051-1/+4
| * | Merge remote branch 'xrdp-org/master'Jay Sorg2013-06-0334-254/+742
| |\ \ | | |/
| | * startwm.sh add back startup logicJay Sorg2013-05-291-24/+100
| | * merge from pmhahnJay Sorg2013-05-2920-210/+622
| | |\
| | | * doc: xrdp-chansrv manual pagePhilipp Hahn2013-01-282-0/+47
| | | * doc: xrdp-sessvc manual pagePhilipp Hahn2013-01-282-1/+28
| | | * doc: xrdp-genkeymap manual pagePhilipp Hahn2013-01-282-0/+68
| | | * doc: xrdp-keygen manual pagePhilipp Hahn2013-01-282-0/+41
| | | * doc: xrdp-xcon manual pagePhilipp Hahn2013-01-282-1/+18
| | | * doc: xrdp-dis manual pagePhilipp Hahn2013-01-282-0/+24
| | | * doc: xrdp-sesadmin manual pagePhilipp Hahn2013-01-282-0/+58
| | | * doc: Update xrdp.ini optionsPhilipp Hahn2013-01-281-6/+166
| | | * doc: Follow xrdp- renamePhilipp Hahn2013-01-282-12/+12
| | | * doc: Man page cleanupPhilipp Hahn2013-01-285-105/+34
| | | * doc: Format manual page referencesPhilipp Hahn2013-01-285-14/+33
| | | * doc: Use man_MANS in Makefile.amPhilipp Hahn2013-01-281-10/+4
| | | * doc: LDAPPhilipp Hahn2013-01-281-0/+6
| | | * X11rdp: Rework changing directoriesPhilipp Hahn2013-01-281-16/+7
| | | * X11rdp: make variables function localPhilipp Hahn2013-01-281-0/+3