diff options
| author | Sebastien Braun | 2010-10-06 00:04:49 +0200 |
|---|---|---|
| committer | Sebastien Braun | 2010-10-06 00:04:49 +0200 |
| commit | f07fc3b426815e28fde23313242fbbb998a08d45 (patch) | |
| tree | ba9eda1a83135a1727d2d35661d6facabee53b95 /icons | |
| parent | Fix recognition of letters in keyboard handler (diff) | |
| parent | Merge remote branch 'openslx/master' into mcastft (diff) | |
| download | pvs-f07fc3b426815e28fde23313242fbbb998a08d45.tar.gz pvs-f07fc3b426815e28fde23313242fbbb998a08d45.tar.xz pvs-f07fc3b426815e28fde23313242fbbb998a08d45.zip | |
Merge remote branch 'openslx/mcastft' into input
Conflicts:
CMakeLists.txt
i18n/pvs_ar_JO.ts
i18n/pvs_de_DE.ts
i18n/pvs_es_MX.ts
i18n/pvs_fr_FR.ts
i18n/pvs_pl_PL.ts
i18n/pvsmgr_ar_JO.ts
i18n/pvsmgr_de_DE.ts
i18n/pvsmgr_es_MX.ts
i18n/pvsmgr_fr_FR.ts
i18n/pvsmgr_pl_PL.ts
icons/README
pvsmgr.qrc
src/gui/mainWindow.cpp
src/pvs.cpp
src/pvs.h
src/pvsDaemon.cpp
src/util/clientGUIUtils.h
Diffstat (limited to 'icons')
| -rw-r--r-- | icons/README | 8 | ||||
| -rw-r--r-- | icons/gears.png | bin | 0 -> 5893 bytes | |||
| -rw-r--r-- | icons/network_configure.png | bin | 0 -> 4447 bytes |
3 files changed, 5 insertions, 3 deletions
diff --git a/icons/README b/icons/README index 823d998..0ce733d 100644 --- a/icons/README +++ b/icons/README @@ -1,3 +1,5 @@ -remote-control.png and remote-control-all.png have been taken from the -Nuvola 1.0 Icon Set, generously provided under the LGPL by its designer, -David Vignoni. See http://www.icon-king.com/projects/nuvola/ +network-configure.png, remote-control.png and remote-control-all.png +have been taken from the Nuvola 1.0 Icon Set, generously provided +under the LGPL by its designer, David Vignoni. + +See http://www.icon-king.com/projects/nuvola/ diff --git a/icons/gears.png b/icons/gears.png Binary files differnew file mode 100644 index 0000000..d0effe4 --- /dev/null +++ b/icons/gears.png diff --git a/icons/network_configure.png b/icons/network_configure.png Binary files differnew file mode 100644 index 0000000..4a2de8c --- /dev/null +++ b/icons/network_configure.png |
