diff options
| author | Jacek Antonelli | 2009-09-23 02:59:42 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-25 04:00:56 -0500 |
| commit | 18ba06a4dd8473f66c5a196d9de085d84c8a06dd (patch) | |
| tree | 866d8f9e409e61800c75ebaedb214d40c6529768 /MANIFESTO.txt | |
| parent | Merge branch 'next' into login-manager (diff) | |
| parent | Fixed unhandled exception in llinventorymodel.cpp (diff) | |
| download | meta-impy-18ba06a4dd8473f66c5a196d9de085d84c8a06dd.zip meta-impy-18ba06a4dd8473f66c5a196d9de085d84c8a06dd.tar.gz meta-impy-18ba06a4dd8473f66c5a196d9de085d84c8a06dd.tar.bz2 meta-impy-18ba06a4dd8473f66c5a196d9de085d84c8a06dd.tar.xz | |
Merge remote branch 'armin/armin-1.2.0-next' into login-manager
Conflicts:
linden/indra/newview/llinventorymodel.cpp
Diffstat (limited to 'MANIFESTO.txt')
0 files changed, 0 insertions, 0 deletions