Merge branch 'master' into core50

Conflicts:
	config/rootfiles/core/50/filelists/icons

diff --git a/config/rootfiles/core/50/filelists/icons b/config/rootfiles/core/50/filelists/icons
deleted file mode 100644 (file)
index 52b22e0..0000000
--- a/config/rootfiles/core/50/filelists/icons
+++ /dev/null
@@ -1,13 +0,0 @@
-srv/web/ipfire/html/images/delete.gif
-srv/web/ipfire/html/images/document-save.png
-srv/web/ipfire/html/images/edit.gif
-srv/web/ipfire/html/images/floppy.gif
-srv/web/ipfire/html/images/forward.gif
-srv/web/ipfire/html/images/info.gif
-srv/web/ipfire/html/images/list-add.png
-srv/web/ipfire/html/images/list-remove.png
-srv/web/ipfire/html/images/package-x-generic.png
-srv/web/ipfire/html/images/reload.gif
-srv/web/ipfire/html/images/stock_ok.png
-srv/web/ipfire/html/images/stock_stop.png
-srv/web/ipfire/html/images/user-trash.png

diff --git a/html/html/images/delete.gif b/html/html/images/delete.gif
index edae2a7f77b189461ab9679f25f9a500df2ad709..855a9b3c2f26fce99bac3b6dc6d7505ee11d6299 100644 (file)
Binary files a/html/html/images/delete.gif and b/html/html/images/delete.gif differ

diff --git a/html/html/images/document-save.png b/html/html/images/document-save.png
index 65a42b2e68e21fda2f4e25400a01393bc90011c3..22ff49571020a2b520d34f622673bea031cbbf2d 100644 (file)
Binary files a/html/html/images/document-save.png and b/html/html/images/document-save.png differ

diff --git a/html/html/images/edit.gif b/html/html/images/edit.gif
index 851d29e64e5565dda9d7f887bde5bdc03e4e0714..c749f465811338334bc05cbc13a6c49dfe6521e3 100644 (file)
Binary files a/html/html/images/edit.gif and b/html/html/images/edit.gif differ

diff --git a/html/html/images/floppy.gif b/html/html/images/floppy.gif
index d0562220dc61a9c3e2dc0c88c5111f2a2fb4a5b9..7db2f32d1da65f4d4f12af9ee70cef5205620acc 100644 (file)
Binary files a/html/html/images/floppy.gif and b/html/html/images/floppy.gif differ

diff --git a/html/html/images/forward.gif b/html/html/images/forward.gif
index fdda6afa9a4212d04374a9b192b026d636ddc29a..33d18b57197a951673ace2b3091fd202ba58dd47 100644 (file)
Binary files a/html/html/images/forward.gif and b/html/html/images/forward.gif differ

diff --git a/html/html/images/info.gif b/html/html/images/info.gif
index 31e680c6c62d7b330c14dffc5f511fa1baeca6bd..94671ef2f88f359a09c7db13d53854a5390ea870 100644 (file)
Binary files a/html/html/images/info.gif and b/html/html/images/info.gif differ

diff --git a/html/html/images/list-add.png b/html/html/images/list-add.png
index 012cb2eb40e3d982f5f05811d5c0992c06027307..1aa7f095c6c282262390748ab2e596a3fc15c228 100644 (file)
Binary files a/html/html/images/list-add.png and b/html/html/images/list-add.png differ

diff --git a/html/html/images/list-remove.png b/html/html/images/list-remove.png
index 2d0c7808383d154feed767d33184457c56607f2f..00b654e8ca567c380fa477d4b32f808c3b5500d3 100644 (file)
Binary files a/html/html/images/list-remove.png and b/html/html/images/list-remove.png differ

diff --git a/html/html/images/package-x-generic.png b/html/html/images/package-x-generic.png
index 5febf95dc6995e01492ae1de2b6b5544e35d9412..9015426153054c0b529b4d9ebdfa06a221d568ac 100644 (file)
Binary files a/html/html/images/package-x-generic.png and b/html/html/images/package-x-generic.png differ

diff --git a/html/html/images/reload.gif b/html/html/images/reload.gif
index 1b04197ee3410cad48a9b3c8c115a827ddeebbc8..a456e7e733e703442d5755520a9d870f670e000d 100644 (file)
Binary files a/html/html/images/reload.gif and b/html/html/images/reload.gif differ

diff --git a/html/html/images/stock_ok.png b/html/html/images/stock_ok.png
index 7a4acb5d176f7ecb214d6f0a6f2679a9c312545b..d92d88d8a472498e358027c560cd0d750f0ffd9c 100644 (file)
Binary files a/html/html/images/stock_ok.png and b/html/html/images/stock_ok.png differ

diff --git a/html/html/images/stock_stop.png b/html/html/images/stock_stop.png
index 8305ee8a432ab2fb4e204dce7acacb05bed242f6..89c212493e4c6b7f4a3621b4722e9b8b887bb7c2 100644 (file)
Binary files a/html/html/images/stock_stop.png and b/html/html/images/stock_stop.png differ

diff --git a/html/html/images/user-trash.png b/html/html/images/user-trash.png
index 2a1c7b1c302876ad1e17d29203798ad6f2d89acc..0e0953c73c60adbbc762d0553f95a586f3054aa6 100644 (file)
Binary files a/html/html/images/user-trash.png and b/html/html/images/user-trash.png differ