Merge branch 'VersionOption' of git://github.com/nils-a/freerdp
authorOtavio Salvador <otavio@ossystems.com.br>
Sat, 23 Oct 2010 21:37:26 +0000 (19:37 -0200)
committerOtavio Salvador <otavio@ossystems.com.br>
Sat, 23 Oct 2010 21:37:26 +0000 (19:37 -0200)
commit4028cf7690c6bef6fc547db1e778fc464ecadf60
tree78404eb6b40bc3855891605bca4e56eb495ef95a
parent34e666fab5e9578e5f17373b3d473889cf0c0d39
parent439564cdc476c2c2d17dd56c86f7a6a0fd93722c
Merge branch 'VersionOption' of git://github.com/nils-a/freerdp

* 'VersionOption' of git://github.com/nils-a/freerdp:
  xfreerdp: new option --version to print out the current xfreerdp in use