diff options
| author | Andris Zeila <andris.zeila@zabbix.com> | 2018-01-02 16:42:17 +0300 |
|---|---|---|
| committer | Andris Zeila <andris.zeila@zabbix.com> | 2018-01-02 16:42:17 +0300 |
| commit | bec8f67b2fac16bf973edca68e8bb754cbabf6af (patch) | |
| tree | c76708d21362f645f264d22ee46327a3145b0cab /.gitattributes | |
| parent | 251caa2367c1334cc50b95a95fad6dab3b6a6007 (diff) | |
| parent | 3bc1392b8f8d3bbcbec17ca6ed2b11534d4f86bc (diff) | |
.......... [DEV-753] merged from upstream
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index c4f4e63fede..84aefc75244 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10,6 +10,7 @@ bin/win64/zabbix_agentd.exe -text svneol=unset#application/x-dosexec bin/win64/zabbix_get.exe -text svneol=unset#application/x-dosexec bin/win64/zabbix_sender.exe -text svneol=unset#application/x-dosexec /build-backend.xml -text +database/elasticsearch/elasticsearch.map -text frontends/php/audio/alarm_average.wav -text svneol=unset#audio/x-wav frontends/php/audio/alarm_disaster.wav -text svneol=unset#audio/x-wav frontends/php/audio/alarm_high.wav -text svneol=unset#audio/x-wav @@ -38,6 +39,7 @@ frontends/php/img/touch-icon-192x192.png -text svneol=unset#image/png frontends/php/locale/ca/LC_MESSAGES/frontend.po -text frontends/php/locale/he/LC_MESSAGES/frontend.po -text frontends/php/tests/images/image.png -text svneol=unset#image/png +include/zbxhistory.h -text include/zbxipcservice.h -text include/zbxserialize.h -text m4/libevent.m4 -text @@ -353,6 +355,10 @@ tests/libs/zbxconf/parse_cfg_file.yaml -text tests/libs/zbxdbhigh/DBselect_uint64.yaml -text tests/libs/zbxjson/zbx_json_path_open.yaml -text tests/libs/zbxjson/zbx_jsonpath_next.yaml -text +tests/libs/zbxsysinfo/linux/KERNEL_MAXPROC.yaml -text +tests/libs/zbxsysinfo/linux/NET_IF_DISCOVERY.yaml -text +tests/libs/zbxsysinfo/linux/SYSTEM_CPU_SWITCHES.yaml -text +tests/libs/zbxsysinfo/linux/VFS_FS_DISCOVERY.yaml -text tests/libs/zbxsysinfo/parse_item_key.yaml -text tests/libs/zbxsysinfo/process.yaml -text upgrades/dbpatches/1.1/1.0_to_1.1alpha1/mysql/Hub.png -text svneol=unset#image/png |