| commit | 1ca61ccb0b255a69d2b5aa3cb0db0f37131886f4 | [log] [tgz] |
|---|---|---|
| author | Bart Van Assche <bvanassche@acm.org> | Sun Dec 15 10:24:20 2013 +0100 |
| committer | Bart Van Assche <bvanassche@acm.org> | Sun Dec 15 10:24:20 2013 +0100 |
| tree | a6c415b5e5699db2efdd17b5c605cbc647aab4a8 | |
| parent | 20e4b37932a9e9cc56b360a236e9d8180793a297 [diff] | |
| parent | 6b706c53d4cf751e495aab66fe39fd51c32ce930 [diff] |
Merge branch 'V5-4-patches' into V5-5-patches * V5-4-patches: Win32: Visual Studio 2013 build fix Conflicts: perl/SNMP/SNMP.xs