diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2011-10-07 17:10:50 +0100 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2011-10-07 17:10:50 +0100 |
| commit | 538abb99f1ee5d2a3b32ba4de134ac1de463a3b9 (patch) | |
| tree | 3d6837350b442f438973e32348937ead5506af13 /core | |
| parent | 66db81309ba030e7e5f36dbdffec90e7fd32322e (diff) | |
| parent | 1f562a2e83f106a637e402afae1697cf2936295a (diff) | |
| download | nextcloud-server-538abb99f1ee5d2a3b32ba4de134ac1de463a3b9.tar.gz nextcloud-server-538abb99f1ee5d2a3b32ba4de134ac1de463a3b9.zip | |
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
Diffstat (limited to 'core')
| -rw-r--r-- | core/img/filetypes/application-pdf.png (renamed from core/img/filetypes/pdf.png) | bin | 591 -> 591 bytes |
| -rw-r--r-- | core/img/filetypes/application-rss+xml.png (renamed from core/img/filetypes/rss.png) | bin | 691 -> 691 bytes |
| -rw-r--r-- | core/img/filetypes/image-svg+xml.png (renamed from core/img/filetypes/svg.png) | bin | 481 -> 481 bytes |
| -rw-r--r-- | core/img/filetypes/msword.png | bin | 342 -> 0 bytes |
| -rw-r--r-- | core/img/filetypes/text-calendar.png (renamed from core/img/filetypes/ical.png) | bin | 675 -> 675 bytes |
| -rw-r--r-- | core/img/filetypes/text-css.png (renamed from core/img/filetypes/css.png) | bin | 524 -> 524 bytes |
| -rw-r--r-- | core/img/filetypes/text-html.png (renamed from core/img/filetypes/html.png) | bin | 578 -> 578 bytes |
| -rw-r--r-- | core/img/filetypes/text-x-c++.png (renamed from core/img/filetypes/cplusplus.png) | bin | 621 -> 621 bytes |
| -rw-r--r-- | core/img/filetypes/text-x-c.png (renamed from core/img/filetypes/c.png) | bin | 587 -> 587 bytes |
| -rw-r--r-- | core/img/filetypes/text-x-csharp.png (renamed from core/img/filetypes/csharp.png) | bin | 700 -> 700 bytes |
| -rw-r--r-- | core/img/filetypes/text-x-h.png (renamed from core/img/filetypes/h.png) | bin | 603 -> 603 bytes |
11 files changed, 0 insertions, 0 deletions
diff --git a/core/img/filetypes/pdf.png b/core/img/filetypes/application-pdf.png Binary files differindex 8f8095e46fa..8f8095e46fa 100644 --- a/core/img/filetypes/pdf.png +++ b/core/img/filetypes/application-pdf.png diff --git a/core/img/filetypes/rss.png b/core/img/filetypes/application-rss+xml.png Binary files differindex 315c4f4fa62..315c4f4fa62 100644 --- a/core/img/filetypes/rss.png +++ b/core/img/filetypes/application-rss+xml.png diff --git a/core/img/filetypes/svg.png b/core/img/filetypes/image-svg+xml.png Binary files differindex a1291c2dfad..a1291c2dfad 100644 --- a/core/img/filetypes/svg.png +++ b/core/img/filetypes/image-svg+xml.png diff --git a/core/img/filetypes/msword.png b/core/img/filetypes/msword.png Binary files differdeleted file mode 100644 index 813f712f726..00000000000 --- a/core/img/filetypes/msword.png +++ /dev/null diff --git a/core/img/filetypes/ical.png b/core/img/filetypes/text-calendar.png Binary files differindex 658913852d6..658913852d6 100644 --- a/core/img/filetypes/ical.png +++ b/core/img/filetypes/text-calendar.png diff --git a/core/img/filetypes/css.png b/core/img/filetypes/text-css.png Binary files differindex 23f3101811f..23f3101811f 100644 --- a/core/img/filetypes/css.png +++ b/core/img/filetypes/text-css.png diff --git a/core/img/filetypes/html.png b/core/img/filetypes/text-html.png Binary files differindex 55d1072eafd..55d1072eafd 100644 --- a/core/img/filetypes/html.png +++ b/core/img/filetypes/text-html.png diff --git a/core/img/filetypes/cplusplus.png b/core/img/filetypes/text-x-c++.png Binary files differindex a87cf847cb7..a87cf847cb7 100644 --- a/core/img/filetypes/cplusplus.png +++ b/core/img/filetypes/text-x-c++.png diff --git a/core/img/filetypes/c.png b/core/img/filetypes/text-x-c.png Binary files differindex 34a05cccf06..34a05cccf06 100644 --- a/core/img/filetypes/c.png +++ b/core/img/filetypes/text-x-c.png diff --git a/core/img/filetypes/csharp.png b/core/img/filetypes/text-x-csharp.png Binary files differindex ffb8fc932f3..ffb8fc932f3 100644 --- a/core/img/filetypes/csharp.png +++ b/core/img/filetypes/text-x-csharp.png diff --git a/core/img/filetypes/h.png b/core/img/filetypes/text-x-h.png Binary files differindex e902abb0767..e902abb0767 100644 --- a/core/img/filetypes/h.png +++ b/core/img/filetypes/text-x-h.png |
