Alexander Brakowski 1c33a5183f solved merge conflict 9 lat temu
..
api_keys.xml 09297a5968 use google maps debug api key 9 lat temu
arrays.xml ac05133325 Added background synchronization with android sync framework. Added country-list retrieval from the tracing API. 9 lat temu
attrs.xml cc96bcc728 Back navigation fixed now. 10 lat temu
broadcast.xml 179924fbd4 preperations for release build and cleanup 10 lat temu
colors.xml 54a036e64c changed behaviour of up navigation to return to old fragment state 10 lat temu
connection_info.xml b1c201468a display internal/external attack for records 10 lat temu
dimens.xml a468c67df0 First steps... 11 lat temu
protocols.xml 4e5ab0adab Started integrating JLan CIFS 9 lat temu
strings.xml a4ba075e2a delete filtered attacks dialog in recordoverview implementation 9 lat temu
strings_disclaimer.xml 38138e5814 changed disclaimer text and added other screens to analytics tracking 10 lat temu
strings_gui.xml 179924fbd4 preperations for release build and cleanup 10 lat temu
strings_preferences.xml 29b16718ff cleaned up adv prefs. also hooked prefs up in code 9 lat temu
styles.xml 54a036e64c changed behaviour of up navigation to return to old fragment state 10 lat temu
version.xml f80bf8764d fixed merge conflicts 10 lat temu