Software / code / prosody
Comparison
Makefile @ 6871:e4b5885b7712
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 25 Sep 2015 18:11:45 +0200 |
| parent | 6840:eeefe8d42b8b |
| child | 6883:954a8a8c46d6 |
comparison
equal
deleted
inserted
replaced
| 6868:dcf9ceac9265 | 6871:e4b5885b7712 |
|---|