Armin Novak d7ee71cc8b Merge branch 'master' of https://github.com/FreeRDP/FreeRDP into android_async ... Conflicts: client/Android/FreeRDPCore/.classpath client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/domain/BookmarkBase.java client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/BookmarkBaseGateway.java client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/BookmarkDB.java		2013-10-04 10:04:03 +02:00
..
attrs.xml	Reorganizing into library project	2013-02-15 02:22:28 -08:00
dimens.xml	Reorganizing into library project	2013-02-15 02:22:28 -08:00
integers.xml	Reorganizing into library project	2013-02-15 02:22:28 -08:00
strings.xml	Merge branch 'master' of https://github.com/FreeRDP/FreeRDP into android_async	2013-10-04 10:04:03 +02:00
theme.xml	Reorganizing into library project	2013-02-15 02:22:28 -08:00