| commit | 055e93cefa1bc97c7f9d1a3b66ddcb9d9444ac0a | |
| author | William McBrine <wmcbrine@gmail.com> | |
| Sat, 2 Feb 2008 17:09:25 +0000 (2 12:09 -0500) | ||
| committer | William McBrine <wmcbrine@gmail.com> | |
| Sat, 2 Feb 2008 17:09:25 +0000 (2 12:09 -0500) | ||
| tree | b4ada3518b7f146835e2630c6c025374053fc494 | treesnapshot (tar.gz zip) |
| parent | 32b3b221adc69ab1e3536aca69024cff3f305290 | commitdiff |
| parent | 62bbe579cb81740b9c03a77b35d60e1b9a1d3a2b | commitdiff |
Merge branch 'master' into subfolders-8.3
Conflicts:
plugins/video/video.py
nothing added to commit but untracked files present (use "git add" to track)
Conflicts:
plugins/video/video.py
nothing added to commit but untracked files present (use "git add" to track)