diff options
| author | daniel oeh <daniel.oeh@gmail.com> | 2014-05-19 00:04:19 +0200 |
|---|---|---|
| committer | daniel oeh <daniel.oeh@gmail.com> | 2014-05-19 00:04:19 +0200 |
| commit | 0f3b77ed8e9a738039cd4f4fbd11919b1f2c6f93 (patch) | |
| tree | bfee5104dadcf27b6f78a4561de1827c0e38d545 /assets | |
| parent | 81fd465276cb9369fa7e82830e97b747d61b4f7e (diff) | |
| parent | f5cbd52fdc8edec26a5df4ee6add616b9273e437 (diff) | |
| download | AntennaPod-0f3b77ed8e9a738039cd4f4fbd11919b1f2c6f93.zip | |
Merge branch 'newgui' into develop. closes #407
Conflicts:
res/layout/feedinfo.xml
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/Roboto-Light.ttf | bin | 0 -> 115200 bytes |
| -rw-r--r-- | assets/Roboto.ttf | bin | 0 -> 114976 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/assets/Roboto-Light.ttf b/assets/Roboto-Light.ttf Binary files differnew file mode 100644 index 000000000..13bf13af0 --- /dev/null +++ b/assets/Roboto-Light.ttf diff --git a/assets/Roboto.ttf b/assets/Roboto.ttf Binary files differnew file mode 100644 index 000000000..0ba95c98c --- /dev/null +++ b/assets/Roboto.ttf |