Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 15 Feb 2013 16:23:59 +0000 (11:23 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 15 Feb 2013 16:23:59 +0000 (11:23 -0500)
commit79878755916c6b760aa8c2b4f846ec6393e1061f
treeaad1e234ab10018668a88e18c6e885a1ecb47f54
parent289aad8d4562d954e27762cb063f36b52ea76214
parentd74a53c7383204b24f2d33f263983b043fb72836
Merge branch 'master' of github.com:FreeRDP/FreeRDP
winpr/include/winpr/collections.h