Software / code / prosody
Comparison
Makefile @ 6870:d5b416070f70
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 25 Sep 2015 18:11:24 +0200 |
| parent | 6840:eeefe8d42b8b |
| child | 6883:954a8a8c46d6 |
comparison
equal
deleted
inserted
replaced
| 6867:de32d195e932 | 6870:d5b416070f70 |
|---|