Comparison

.hgignore @ 2906:2b54ef7cec32

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Sat, 20 Mar 2010 14:17:51 +0000
parent 2905:b924d915c4d0
child 3635:72f3619eeabd
comparison
equal deleted inserted replaced
2904:3e06b0f52363 2906:2b54ef7cec32
4 local 4 local
5 www_files 5 www_files
6 html/* 6 html/*
7 prosody.lua 7 prosody.lua
8 prosody.cfg.lua 8 prosody.cfg.lua
9 prosody.version
9 config.unix 10 config.unix
10 *.patch 11 *.patch
11 *.orig 12 *.orig
12 *.rej 13 *.rej
13 *.save 14 *.save