diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-13 18:54:16 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-13 18:54:16 +0300 |
| commit | ba1123e3e482fdd061095c1374a41f8d007fbc22 (patch) | |
| tree | 499b01923892a406d306eadd4507e6d7a41b471b /indra/llui/llbutton.cpp | |
| parent | 623dae525dc14a69322266e33421770431c34a66 (diff) | |
| parent | c3099df719274556fede1a57bc42e555e5c89fbb (diff) | |
Manual merge from default branch
Resolved conflicts in llpaneloutfitedit.cpp
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/llbutton.cpp')
| -rw-r--r-- | indra/llui/llbutton.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index 39e46a7ccb..aeedf62379 100644 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -1,3 +1,4 @@ + /** * @file llbutton.cpp * @brief LLButton base class |