← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/include.am

Merged from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/include.am
263
263
                              drizzled/memory/multi_malloc.h \
264
264
                              drizzled/memory/root.h \
265
265
                              drizzled/my_decimal.h \
266
 
                              drizzled/my_error.h \
267
266
                              drizzled/my_getopt.h \
268
267
                              drizzled/my_hash.h \
269
268
                              drizzled/my_time.h \
465
464
                            drizzled/drizzled.cc \
466
465
                            drizzled/dtcollation.cc \
467
466
                            drizzled/errmsg_print.cc \
468
 
                            drizzled/error.cc \
469
467
                            drizzled/field.cc \
470
468
                            drizzled/field/blob.cc \
471
469
                            drizzled/field/date.cc \
778
776
                                drizzled/ctype.cc
779
777
 
780
778
drizzled_libdynamic_array_la_SOURCES = drizzled/dynamic_array.cc
781
 
drizzled_liberror_la_SOURCES = drizzled/my_error.cc
 
779
drizzled_liberror_la_SOURCES = drizzled/error.cc
782
780
drizzled_libgetopt_la_SOURCES = drizzled/my_getopt.cc
783
781
drizzled_libtypelib_la_SOURCES = drizzled/typelib.cc
784
782
drizzled_libserialutil_la_SOURCES = drizzled/db.cc drizzled/table_proto_write.cc