79986643c0
Trunk merge conflicts resolved git-svn-id: svn://localhost/ardour2/branches/undo@756 d708f5d6-7413-0410-9779-e7cbd77b26cf |
||
|---|---|---|
| .. | ||
| .cvsignore | ||
| forwardblarrow.xpm | ||
| hiin.xpm | ||
| hiout.xpm | ||
| hslider00.xpm | ||
| hslider01.xpm | ||
| left_arrow.xpm | ||
| linin.xpm | ||
| linout.xpm | ||
| loin.xpm | ||
| loop.xpm | ||
| loout.xpm | ||
| lr.xpm | ||
| regin2.xpm | ||
| regin.xpm | ||
| regout2.xpm | ||
| regout.xpm | ||
| revdblarrow.xpm | ||
| right_arrow.xpm | ||
| SConscript | ||
| set-next-button.xpm | ||
| small_x.xpm | ||
| small-round-button-01.xpm | ||
| toggle-button-00.xpm | ||
| toggle-button-01.xpm | ||
| tool_audition.xpm | ||
| tool_gain.xpm | ||
| tool_object.xpm | ||
| tool_range.xpm | ||
| tool_stretch.xpm | ||
| tool_zoom.xpm | ||
| vslider00.xpm | ||
| vslider01.xpm | ||
| vslider02_rail.xpm | ||
| vslider02_slider.xpm | ||
| vslider_slider_16wide.xpm | ||
| zoom_full.xpm | ||
| zoom_in.xpm | ||
| zoom_out.xpm | ||