diff options
| author | spag <spag@golwen.net> | 2013-01-18 14:23:43 +0100 |
|---|---|---|
| committer | spag <spag@golwen.net> | 2013-01-18 14:23:43 +0100 |
| commit | 5d535a508d9e84cbaf3cb8b5a21797f94b38f9ab (patch) | |
| tree | 099438f250c56a1bcac404c82a0271c14a1a98ac /misc/freeswitch/scripts/phones | |
| parent | 6994ba4b5fecc2d532770f922d76227a175e3d71 (diff) | |
| parent | 8b37b125399ba4019091b83efe889dc8af89185f (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Conflicts:
misc/freeswitch/scripts/ini/routes.ini
Diffstat (limited to 'misc/freeswitch/scripts/phones')
| -rw-r--r-- | misc/freeswitch/scripts/phones/phone.lua | 2 | ||||
| -rw-r--r-- | misc/freeswitch/scripts/phones/siemens.lua | 2 | ||||
| -rw-r--r-- | misc/freeswitch/scripts/phones/snom.lua | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/misc/freeswitch/scripts/phones/phone.lua b/misc/freeswitch/scripts/phones/phone.lua index bc2aa3d..856398b 100644 --- a/misc/freeswitch/scripts/phones/phone.lua +++ b/misc/freeswitch/scripts/phones/phone.lua @@ -1,5 +1,5 @@ -- Gemeinschaft 5 module: phone class --- (c) AMOOMA GmbH 2012 +-- (c) AMOOMA GmbH 2012-2013 -- module(...,package.seeall) diff --git a/misc/freeswitch/scripts/phones/siemens.lua b/misc/freeswitch/scripts/phones/siemens.lua index 71bb40a..ad2447a 100644 --- a/misc/freeswitch/scripts/phones/siemens.lua +++ b/misc/freeswitch/scripts/phones/siemens.lua @@ -1,5 +1,5 @@ -- Gemeinschaft 5 module: general siemens model class --- (c) AMOOMA GmbH 2012 +-- (c) AMOOMA GmbH 2012-2013 -- module(...,package.seeall) diff --git a/misc/freeswitch/scripts/phones/snom.lua b/misc/freeswitch/scripts/phones/snom.lua index 80d1fce..096ccb7 100644 --- a/misc/freeswitch/scripts/phones/snom.lua +++ b/misc/freeswitch/scripts/phones/snom.lua @@ -1,5 +1,5 @@ -- Gemeinschaft 5 module: general snom model class --- (c) AMOOMA GmbH 2012 +-- (c) AMOOMA GmbH 2012-2013 -- module(...,package.seeall) |