d7ee71cc8b
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 |
||
---|---|---|
.. | ||
advanced_settings.xml | ||
application_settings.xml | ||
bookmark_settings.xml | ||
credentials_settings.xml | ||
cursor_keyboard.xml | ||
debug_settings.xml | ||
gateway_settings.xml | ||
modifiers_keyboard.xml | ||
numpad_keyboard.xml | ||
performance_flags_3g.xml | ||
performance_flags.xml | ||
screen_settings_3g.xml | ||
screen_settings.xml | ||
specialkeys_keyboard.xml |