diff options
| author | David Walter Seikel | 2011-07-21 21:00:47 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2011-07-21 21:00:47 +1000 |
| commit | f4d07b4a04b432141d8426932f4dd955b9f1a9f1 (patch) | |
| tree | 1b8e09f6c0ba902fb2212e9c05c4b361fbcb6bbb /.gitignore | |
| parent | Bump version number. (diff) | |
| parent | Support modulo in llcalcparser (diff) | |
| download | meta-impy-f4d07b4a04b432141d8426932f4dd955b9f1a9f1.zip meta-impy-f4d07b4a04b432141d8426932f4dd955b9f1a9f1.tar.gz meta-impy-f4d07b4a04b432141d8426932f4dd955b9f1a9f1.tar.bz2 meta-impy-f4d07b4a04b432141d8426932f4dd955b9f1a9f1.tar.xz | |
Merge remote-tracking branch 'imprudence/1.4-beta1.5' into next
Conflicts (merged manually):
.gitignore
linden/indra/newview/llgesturemgr.cpp
linden/indra/newview/viewerinfo.cpp
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
| @@ -39,4 +39,5 @@ ChangeLog.txt | |||
| 39 | .DS_Store | 39 | .DS_Store |
| 40 | *.zip | 40 | *.zip |
| 41 | linden/indra/newview/mozilla-universal-darwin.tgz | 41 | linden/indra/newview/mozilla-universal-darwin.tgz |
| 42 | linden/indra/newview/hide \ No newline at end of file | 42 | linden/indra/newview/hide |
| 43 | |||