diff options
| author | David Seikel | 2011-06-19 16:43:32 +1000 |
|---|---|---|
| committer | David Seikel | 2011-06-19 16:43:32 +1000 |
| commit | 8c0f49774d59e1f8420bcbf572f91a1ac67cedb1 (patch) | |
| tree | 3f4d86ccc5974df375de23dc5d2caf3d5f11b198 /linden/indra/newview/llanimstatelabels.h | |
| parent | Merge remote-tracking branch 'jacek/next' into next (diff) | |
| parent | Clarified the terms for activating spellchecking dictionaries. (diff) | |
| download | meta-impy-8c0f49774d59e1f8420bcbf572f91a1ac67cedb1.zip meta-impy-8c0f49774d59e1f8420bcbf572f91a1ac67cedb1.tar.gz meta-impy-8c0f49774d59e1f8420bcbf572f91a1ac67cedb1.tar.bz2 meta-impy-8c0f49774d59e1f8420bcbf572f91a1ac67cedb1.tar.xz | |
Merge branch 'next' of git://github.com/jacek/imprudence into next
Conflicts (manually merged the grids, ignored the other two):
linden/indra/newview/app_settings/default_grids.xml
linden/indra/newview/llvoavatar.cpp
linden/indra/newview/skins/default/xui/en-us/panel_login.xml
Diffstat (limited to 'linden/indra/newview/llanimstatelabels.h')
0 files changed, 0 insertions, 0 deletions