diff options
| author | Melanie | 2012-03-20 02:48:11 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-20 02:48:11 +0000 |
| commit | 5768a151ffca0ac34d14cab59d70dc5223e531db (patch) | |
| tree | 6b1eedd67fca3ea6c1ad1c9d3e6128e0e07bcea2 /.nant | |
| parent | Remove debug output using Console.WriteLine and trim excessive whitespace (diff) | |
| parent | Remove pointless ThreadAbortException catching in a test that isn't run anyway. (diff) | |
| download | opensim-SC_OLD-5768a151ffca0ac34d14cab59d70dc5223e531db.zip opensim-SC_OLD-5768a151ffca0ac34d14cab59d70dc5223e531db.tar.gz opensim-SC_OLD-5768a151ffca0ac34d14cab59d70dc5223e531db.tar.bz2 opensim-SC_OLD-5768a151ffca0ac34d14cab59d70dc5223e531db.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLXAssetData.cs
Diffstat (limited to '.nant')
0 files changed, 0 insertions, 0 deletions