-
Committer:
Continuous Integration
-
Date:
2012-07-30 08:08:35 UTC
-
mfrom:
(2564.3.1 drizzle)
-
Revision ID:
ci@drizzle.org-20120730080835-g9z5j6swpatysjq0
modified:
drizzled/main.cc
drizzled/signal_handler.cc
drizzled/signal_handler.h
pending merge tips: (use -v to see all merge revisions)
denisboyun 2012-06-07 [merge] Ctrl-C/Z are worked(resolve conflict)