diff options
| author | Tom Feist <shabble@metavore.org> | 2010-10-08 00:44:42 +0000 |
|---|---|---|
| committer | Tom Feist <shabble@metavore.org> | 2010-10-08 00:44:42 +0000 |
| commit | 7c447b8328be2e404fa3d34780da3c0e954082d0 (patch) | |
| tree | 57d5304bbfb44916310be5b8b76293aa4c5cc520 /throttled-autojoin | |
| parent | added prompt_replace to dev branch (diff) | |
| parent | vim_mode: Fix :registers' display of "+ and "*. (diff) | |
| download | irssi-scripts-7c447b8328be2e404fa3d34780da3c0e954082d0.tar.gz irssi-scripts-7c447b8328be2e404fa3d34780da3c0e954082d0.zip | |
Merge remote branch 'origin/dev' into dev
Conflicts:
prompt_info/prompt_replace.pl
test/irssi/config
Diffstat (limited to 'throttled-autojoin')
0 files changed, 0 insertions, 0 deletions