diff options
| author | Jacek Antonelli | 2009-09-23 02:52:02 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-23 02:52:02 -0500 |
| commit | 43e98d9922d2d163fb5f44f63e33fa207b53d3c2 (patch) | |
| tree | e5da68070e495a4554450159682a8532fd0b61a2 /CONTRIBUTE.txt | |
| parent | Updated Grid Manager from Meerkat's SVN (as of r215). (diff) | |
| parent | Moved "Show HUD Attachments" back to View, restored shortcut. (diff) | |
| download | meta-impy-43e98d9922d2d163fb5f44f63e33fa207b53d3c2.zip meta-impy-43e98d9922d2d163fb5f44f63e33fa207b53d3c2.tar.gz meta-impy-43e98d9922d2d163fb5f44f63e33fa207b53d3c2.tar.bz2 meta-impy-43e98d9922d2d163fb5f44f63e33fa207b53d3c2.tar.xz | |
Merge branch 'next' into login-manager
Conflicts:
linden/indra/newview/llinventorymodel.cpp
linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
Diffstat (limited to 'CONTRIBUTE.txt')
0 files changed, 0 insertions, 0 deletions