| .. |
|
activity
|
f80bf8764d
fixed merge conflicts
|
%!s(int64=9) %!d(string=hai) anos |
|
adapter
|
f80bf8764d
fixed merge conflicts
|
%!s(int64=9) %!d(string=hai) anos |
|
dialog
|
cb543bc5ca
merged conflicts
|
%!s(int64=9) %!d(string=hai) anos |
|
fragment
|
5bf42a8e9d
merge conflicts fixed
|
%!s(int64=9) %!d(string=hai) anos |
|
helper
|
cb543bc5ca
merged conflicts
|
%!s(int64=9) %!d(string=hai) anos |
|
layouts
|
cb543bc5ca
merged conflicts
|
%!s(int64=9) %!d(string=hai) anos |
|
model
|
f80bf8764d
fixed merge conflicts
|
%!s(int64=9) %!d(string=hai) anos |
|
popup
|
cb543bc5ca
merged conflicts
|
%!s(int64=9) %!d(string=hai) anos |
|
swipelist
|
cb543bc5ca
merged conflicts
|
%!s(int64=9) %!d(string=hai) anos |
|
task
|
66b19427a8
Merged rc - branch and small clean up
|
%!s(int64=10) %!d(string=hai) anos |
Alexander Brakowski
5bf42a8e9d
merge conflicts fixed