Commit [c7fb8e] pure-data_0.43-1test4 Maximize Restore History

tried to merge to fix fact that I was mistakenly editing out on a branch

Merge branch 'oops'

Conflicts:
tcl/pdtk_text.tcl

changed doc/1.manual/x1.htm
changed doc/1.manual/x3.htm
changed doc/1.manual/x5.htm
changed extra/bonk~/bonk~.c
changed linux/README.txt
changed src/d_soundfile.c
changed src/g_editor.c
changed src/m_binbuf.c
changed src/m_pd.h
changed src/s_inter.c
changed src/s_main.c
changed src/s_print.c
changed src/s_stuff.h
changed src/s_watchdog.c
changed tcl/pd_guiprefs.tcl
changed tcl/pdtk_canvas.tcl
changed tcl/pdtk_text.tcl
changed README.txt
doc/1.manual/x1.htm Diff Switch to side-by-side view
Loading...
doc/1.manual/x3.htm Diff Switch to side-by-side view
Loading...
doc/1.manual/x5.htm Diff Switch to side-by-side view
Loading...
extra/bonk~/bonk~.c Diff Switch to side-by-side view
Loading...
linux/README.txt Diff Switch to side-by-side view
Loading...
src/d_soundfile.c Diff Switch to side-by-side view
Loading...
src/g_editor.c Diff Switch to side-by-side view
Loading...
src/m_binbuf.c Diff Switch to side-by-side view
Loading...
src/m_pd.h Diff Switch to side-by-side view
Loading...
src/s_inter.c Diff Switch to side-by-side view
Loading...
src/s_main.c Diff Switch to side-by-side view
Loading...
src/s_print.c Diff Switch to side-by-side view
Loading...
src/s_stuff.h Diff Switch to side-by-side view
Loading...
src/s_watchdog.c Diff Switch to side-by-side view
Loading...
tcl/pd_guiprefs.tcl Diff Switch to side-by-side view
Loading...
tcl/pdtk_canvas.tcl Diff Switch to side-by-side view
Loading...
tcl/pdtk_text.tcl Diff Switch to side-by-side view
Loading...
README.txt Diff Switch to side-by-side view
Loading...