Software / code / prosody
Diff
Makefile @ 6068:175590cc7b07
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 10 Apr 2014 13:16:54 +0200 |
| parent | 6044:1ce05d38d1bb |
| child | 6406:f04a6c700b2f |
| child | 6574:cd0088c73daf |
/ code / prosody | author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 10 Apr 2014 13:16:54 +0200 |
| parent | 6044:1ce05d38d1bb |
| child | 6406:f04a6c700b2f |
| child | 6574:cd0088c73daf |