diff options
| author | Anders Arnholm | 2008-12-15 14:28:30 +0100 |
|---|---|---|
| committer | Anders Arnholm | 2008-12-15 14:28:30 +0100 |
| commit | 4f0e669d95e61dd34696f8a3214b6acdc7aa6e1a (patch) | |
| tree | b8ce0209ceec80e33d1781d89e77c71a5058af7d /linden/indra/llmedia | |
| parent | .. (diff) | |
| parent | Version string generator now includes test label. (diff) | |
| download | meta-impy-4f0e669d95e61dd34696f8a3214b6acdc7aa6e1a.zip meta-impy-4f0e669d95e61dd34696f8a3214b6acdc7aa6e1a.tar.gz meta-impy-4f0e669d95e61dd34696f8a3214b6acdc7aa6e1a.tar.bz2 meta-impy-4f0e669d95e61dd34696f8a3214b6acdc7aa6e1a.tar.xz | |
Merge branch 'next' of git://github.com/jacek/imprudence into next
Conflicts:
ChangeLog.txt
linden/indra/llcommon/llversionviewer.h
Diffstat (limited to 'linden/indra/llmedia')
0 files changed, 0 insertions, 0 deletions