diff options
| author | Palmer <palmer@lindenlab.com> | 2010-07-22 15:25:37 -0700 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2010-07-22 15:25:37 -0700 |
| commit | a44551e2821d557b709459816b3aab18b33937ed (patch) | |
| tree | 80078a2d742d9291355f0b79d8756a8ea8d0ddd8 /indra/newview/skins/default/xui/it/floater_hardware_settings.xml | |
| parent | 7d73afe8957b64a5b3620d162265484618aee9fc (diff) | |
| parent | a9ff46d89904cac05ac09678e4057d8bb019c51d (diff) | |
OH NO! This may be my last merge! You might want to read all of this...
Whatever will I do if I can no longer merge in the indra codebase?
What has my life come to?
Without merging, who am I?
Why am I here?
I like cupcakes.
Merging makes me feel complete.
Like doing something without really doing something.
I say merge, and it merges.
I like not having to do three way diffs, but still claim I'm merging.
Three way merging is no fun.
You're still reading this.
You deserve a cupcake.
You read checkins. You're special. You're either dessie, erica, or brad.
I'll miss you guys.
Keep them doggies mergin.
Diffstat (limited to 'indra/newview/skins/default/xui/it/floater_hardware_settings.xml')
0 files changed, 0 insertions, 0 deletions