Merge branch 'master' into groups

Browse Source

...

This commit is contained in:

Moxie Marlinspike

2014-02-18 13:53:35 -08:00

parent 3999171377 fc3411da83

commit 760c96171d

313 changed files with 87 additions and 65 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

res/drawable-hdpi/ic_menu_split_holo_dark.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.5 KiB After Width:  |  Height:  |  Size: 502 B