diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-05-10 15:50:52 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-05-10 15:50:52 +0200 |
| commit | aa4f6b8a17400e6ebbe83d92e26b25413deb9aa1 (patch) | |
| tree | 0798f107e13d8a8546c1b15c6432e5360a656e92 /id/server/moa-id-frontend-resources/src/main/resources/mainGUI | |
| parent | 576f5ea5cfaf2ea174f198dc5df238c1ca0c331a (diff) | |
| parent | c3e07d7fb87b2d132ffc838e4878b9479da361a7 (diff) | |
| download | moa-id-spss-aa4f6b8a17400e6ebbe83d92e26b25413deb9aa1.tar.gz moa-id-spss-aa4f6b8a17400e6ebbe83d92e26b25413deb9aa1.tar.bz2 moa-id-spss-aa4f6b8a17400e6ebbe83d92e26b25413deb9aa1.zip | |
Update to MOA-SPSS 3.0.0-RC1
Merge branch 'moa-id-3.2_(OPB)' into moa-id_with_moa-sig_and_eccelerate
Conflicts:
id/moa-spss-container/pom.xml
pom.xml
Diffstat (limited to 'id/server/moa-id-frontend-resources/src/main/resources/mainGUI')
| -rw-r--r-- | id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/handy_deprecated.gif (renamed from id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/handy.gif) | bin | 4460 -> 4460 bytes |
| -rw-r--r-- | id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/handysign.png | bin | 0 -> 377212 bytes |
| -rw-r--r-- | id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/karte.png | bin | 0 -> 21957 bytes |
| -rw-r--r-- | id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/karte_deactivated.png | bin | 0 -> 20539 bytes |
| -rw-r--r-- | id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/karte_deprecated.gif (renamed from id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/karte.gif) | bin | 3360 -> 3360 bytes |
| -rw-r--r-- | id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/mobile-bku_deprecated.png (renamed from id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/mobile-bku.png) | bin | 4602 -> 4602 bytes |
| -rw-r--r-- | id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/online-bku-deactivated_deprecated.png (renamed from id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/online-bku-deactivated.png) | bin | 5382 -> 5382 bytes |
| -rw-r--r-- | id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/online-bku_deprecated.png (renamed from id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/online-bku.png) | bin | 6011 -> 6011 bytes |
8 files changed, 0 insertions, 0 deletions
diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/handy.gif b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/handy_deprecated.gif Binary files differindex 5aeb542db..5aeb542db 100644 --- a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/handy.gif +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/handy_deprecated.gif diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/handysign.png b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/handysign.png Binary files differnew file mode 100644 index 000000000..2c3645774 --- /dev/null +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/handysign.png diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/karte.png b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/karte.png Binary files differnew file mode 100644 index 000000000..5dfa694ca --- /dev/null +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/karte.png diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/karte_deactivated.png b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/karte_deactivated.png Binary files differnew file mode 100644 index 000000000..5775734f2 --- /dev/null +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/karte_deactivated.png diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/karte.gif b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/karte_deprecated.gif Binary files differindex ee9ab7cad..ee9ab7cad 100644 --- a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/karte.gif +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/karte_deprecated.gif diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/mobile-bku.png b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/mobile-bku_deprecated.png Binary files differindex 697514273..697514273 100644 --- a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/mobile-bku.png +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/mobile-bku_deprecated.png diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/online-bku-deactivated.png b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/online-bku-deactivated_deprecated.png Binary files differindex c2145f12a..c2145f12a 100644 --- a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/online-bku-deactivated.png +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/online-bku-deactivated_deprecated.png diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/online-bku.png b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/online-bku_deprecated.png Binary files differindex d7d524999..d7d524999 100644 --- a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/online-bku.png +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/img/online-bku_deprecated.png |
