Merge

2006-11-16 16:55:58 -05:00
parent a029157488 9031ebf503
commit 0c47294dbd
43 changed files with 933 additions and 88 deletions
@@ -6,6 +6,6 @@
 <Alt>p=prev
 <Alt>c=close

-<Alt><Shift>F12=!sugar-log-viewer
+<Alt><Shift>F12=!sugar-devel-console
 <Alt>q=!sugar-emulator-shutdown
 <Alt><Shift>Escape=!sugar-shutdown