diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2010-08-29 14:22:01 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2010-08-29 14:22:01 +0200 |
| commit | 2c053ed58376c6709596ab48fc40dceb90d4e89d (patch) | |
| tree | c8d0f78c2f47f373473419396d3c0855ec671eca /lib/images | |
| parent | cb4a07568e84d853fbcd9d5eca37f572fa10786f (diff) | |
| parent | 5479a8c3341247ca228026819f20f3ab5c34a80f (diff) | |
| download | rpg-2c053ed58376c6709596ab48fc40dceb90d4e89d.tar.gz rpg-2c053ed58376c6709596ab48fc40dceb90d4e89d.tar.bz2 | |
Merge branch 'master' into stable
Conflicts:
conf/msg
lib/plugins/acl/ajax.php
Diffstat (limited to 'lib/images')
24 files changed, 0 insertions, 0 deletions
diff --git a/lib/images/fileicons/7z.png b/lib/images/fileicons/7z.png Binary files differnew file mode 100644 index 000000000..52f7d5d72 --- /dev/null +++ b/lib/images/fileicons/7z.png diff --git a/lib/images/fileicons/audio.png b/lib/images/fileicons/audio.png Binary files differnew file mode 100644 index 000000000..98883256d --- /dev/null +++ b/lib/images/fileicons/audio.png diff --git a/lib/images/fileicons/csv.png b/lib/images/fileicons/csv.png Binary files differnew file mode 100644 index 000000000..3a8835360 --- /dev/null +++ b/lib/images/fileicons/csv.png diff --git a/lib/images/fileicons/docx.png b/lib/images/fileicons/docx.png Binary files differnew file mode 100644 index 000000000..932567f8a --- /dev/null +++ b/lib/images/fileicons/docx.png diff --git a/lib/images/fileicons/mp3.png b/lib/images/fileicons/mp3.png Binary files differnew file mode 100644 index 000000000..928705d7a --- /dev/null +++ b/lib/images/fileicons/mp3.png diff --git a/lib/images/fileicons/ogg.png b/lib/images/fileicons/ogg.png Binary files differnew file mode 100644 index 000000000..62cea6aaa --- /dev/null +++ b/lib/images/fileicons/ogg.png diff --git a/lib/images/fileicons/pptx.png b/lib/images/fileicons/pptx.png Binary files differnew file mode 100644 index 000000000..adaefc602 --- /dev/null +++ b/lib/images/fileicons/pptx.png diff --git a/lib/images/fileicons/sql.png b/lib/images/fileicons/sql.png Binary files differnew file mode 100644 index 000000000..f60054a3a --- /dev/null +++ b/lib/images/fileicons/sql.png diff --git a/lib/images/fileicons/wav.png b/lib/images/fileicons/wav.png Binary files differnew file mode 100644 index 000000000..79e80760e --- /dev/null +++ b/lib/images/fileicons/wav.png diff --git a/lib/images/fileicons/xlsx.png b/lib/images/fileicons/xlsx.png Binary files differnew file mode 100644 index 000000000..e8cd58dc0 --- /dev/null +++ b/lib/images/fileicons/xlsx.png diff --git a/lib/images/license/badge/cc-zero.png b/lib/images/license/badge/cc-zero.png Binary files differnew file mode 100644 index 000000000..8a0ef3e3b --- /dev/null +++ b/lib/images/license/badge/cc-zero.png diff --git a/lib/images/license/button/cc-zero.png b/lib/images/license/button/cc-zero.png Binary files differnew file mode 100644 index 000000000..fc99eff61 --- /dev/null +++ b/lib/images/license/button/cc-zero.png diff --git a/lib/images/media_align_center.png b/lib/images/media_align_center.png Binary files differnew file mode 100644 index 000000000..3db90fc17 --- /dev/null +++ b/lib/images/media_align_center.png diff --git a/lib/images/media_align_left.png b/lib/images/media_align_left.png Binary files differnew file mode 100644 index 000000000..cebbb1a9a --- /dev/null +++ b/lib/images/media_align_left.png diff --git a/lib/images/media_align_noalign.png b/lib/images/media_align_noalign.png Binary files differnew file mode 100644 index 000000000..74f34e5f1 --- /dev/null +++ b/lib/images/media_align_noalign.png diff --git a/lib/images/media_align_right.png b/lib/images/media_align_right.png Binary files differnew file mode 100644 index 000000000..5f54a4a49 --- /dev/null +++ b/lib/images/media_align_right.png diff --git a/lib/images/media_link_direct.png b/lib/images/media_link_direct.png Binary files differnew file mode 100644 index 000000000..4bdb3541e --- /dev/null +++ b/lib/images/media_link_direct.png diff --git a/lib/images/media_link_displaylnk.png b/lib/images/media_link_displaylnk.png Binary files differnew file mode 100644 index 000000000..25eacb7c2 --- /dev/null +++ b/lib/images/media_link_displaylnk.png diff --git a/lib/images/media_link_lnk.png b/lib/images/media_link_lnk.png Binary files differnew file mode 100644 index 000000000..1209164ca --- /dev/null +++ b/lib/images/media_link_lnk.png diff --git a/lib/images/media_link_nolnk.png b/lib/images/media_link_nolnk.png Binary files differnew file mode 100644 index 000000000..fc3c393ca --- /dev/null +++ b/lib/images/media_link_nolnk.png diff --git a/lib/images/media_size_large.png b/lib/images/media_size_large.png Binary files differnew file mode 100644 index 000000000..e2fb548d9 --- /dev/null +++ b/lib/images/media_size_large.png diff --git a/lib/images/media_size_medium.png b/lib/images/media_size_medium.png Binary files differnew file mode 100644 index 000000000..b33157256 --- /dev/null +++ b/lib/images/media_size_medium.png diff --git a/lib/images/media_size_original.png b/lib/images/media_size_original.png Binary files differnew file mode 100644 index 000000000..d179aa2db --- /dev/null +++ b/lib/images/media_size_original.png diff --git a/lib/images/media_size_small.png b/lib/images/media_size_small.png Binary files differnew file mode 100644 index 000000000..04efe7080 --- /dev/null +++ b/lib/images/media_size_small.png |
