Commit graph

72 commits

Author SHA1 Message Date
Rebecca Schofield
8dc821422b oosp 2015-09-15 21:42:08 -05:00
Rebecca Schofield
5509e64f00 use this frameworkgit rm DBEngine.cpp 2015-09-15 21:36:52 -05:00
Rebecca Schofield
dce0187660 new framework 2015-09-15 21:33:15 -05:00
Rebecca Schofield
dc3bbcba37 new framework 2015-09-15 21:31:19 -05:00
Rebecca Schofield
92a5ba2e93 updated DB engine 2015-09-15 21:13:15 -05:00
William Bracho Blok
70e2970430 Update Attribute.h 2015-09-15 21:04:08 -05:00
William Bracho Blok
6004fe724f Update test2.cpp 2015-09-15 21:03:35 -05:00
William Bracho Blok
e90e0c990f Update Relation.h 2015-09-15 21:03:01 -05:00
Rebecca Schofield
94912e6b14 attribute works as expects 2015-09-15 20:55:21 -05:00
William Bracho Blok
b2fa6c1a55 Update Relation.h 2015-09-15 20:36:33 -05:00
William Bracho Blok
8a3104652e Update test2.cpp 2015-09-15 20:36:07 -05:00
William Bracho Blok
9f0003caef Update Attribute.h 2015-09-15 20:35:43 -05:00
William Bracho Blok
c052e7cbf0 Create Relation.h 2015-09-15 20:23:47 -05:00
Rebecca Schofield
903b6c98d5 merged with brandon 2015-09-15 20:23:27 -05:00
Brandon Jackson
560e345828 Update test.cpp 2015-09-15 20:22:35 -05:00
Brandon Jackson
6fa6ad2b44 Update Relation.h 2015-09-15 20:22:17 -05:00
William Bracho Blok
2b1141bfe7 Update test2.cpp 2015-09-15 20:21:50 -05:00
Brandon Jackson
d4e1e5bc04 Update Attribute.h 2015-09-15 20:21:26 -05:00
William Bracho Blok
f748c986fa Update Attribute.h 2015-09-15 20:21:19 -05:00
Brandon Jackson
758d3e55cc Update DBEngine.cpp 2015-09-15 20:21:06 -05:00
Brandon Jackson
d28e68beb0 Update and rename db_engine.h to DBEngine.h 2015-09-15 20:19:49 -05:00
Brandon Jackson
f5db5ac3ec Update and rename db_engine.cpp to DBEngine.cpp 2015-09-15 20:19:10 -05:00
Brandon Jackson
b24f5117f4 Create Relation.h 2015-09-15 20:17:52 -05:00
Brandon Jackson
990dfa0056 Create Attribute.h 2015-09-15 20:17:21 -05:00
Brandon Jackson
b842955e3e Update test.cpp 2015-09-15 20:16:58 -05:00
William Bracho Blok
0dba891839 Update test2.cpp 2015-09-15 19:11:46 -05:00
William Bracho Blok
163270d71a Create test2.cpp 2015-09-15 18:59:58 -05:00
William Bracho Blok
91ae6e305a Create Attribute.h 2015-09-15 18:56:40 -05:00
Rebecca Schofield
0e99c2e305 updating structure 2015-09-15 16:32:05 -05:00
Rebecca Schofield
a449b76e21 updating structure 2015-09-15 16:30:25 -05:00
Becca
30f3484e98 updates 2015-09-15 10:22:56 -05:00
Becca
cdc2b3ccf6 updates 2015-09-15 10:21:27 -05:00
Becca
c23f25b20a updates 2015-09-15 10:21:16 -05:00
Brandon Jackson
68263bd013 Update db_engine.h 2015-09-15 02:57:33 -05:00
Brandon Jackson
a966090eea Update db_engine.cpp 2015-09-15 02:57:09 -05:00
Becca
7fe87111fc assignments for the night 2015-09-14 18:39:04 -05:00
Becca
e9e631aa6b changed show 2015-09-14 18:34:55 -05:00
Becca
f0d54ab69d got our stuff together 2015-09-14 18:31:05 -05:00
Becca
2b4590ebf4 fixed the merge conflict 2015-09-14 17:03:23 -05:00
Becca
0678531d81 testing real quick 2015-09-14 16:59:59 -05:00
Becca
aa4948770f Merge branch 'master' into beccadev 2015-09-14 16:56:59 -05:00
Becca
f710bc5f91 Revert "Update README.txt"
This reverts commit 83d0ae00fe.
2015-09-14 16:54:10 -05:00
Becca
5cb634ad83 Merge branch 'master' into beccadev 2015-09-14 16:51:52 -05:00
Becca
efb56324cf fixed desync 2015-09-14 16:49:57 -05:00
Becca
0b3fa73bda done saveCmd 2015-09-14 16:46:49 -05:00
scho4077
83d0ae00fe Update README.txt 2015-09-14 16:46:41 -05:00
Becca
b98c396637 updating 2015-09-14 16:25:22 -05:00
Becca
7c252e3746 deleted rtf format 2015-09-14 15:55:53 -05:00
Becca
572d57b46c added README.txt 2015-09-14 15:54:08 -05:00
Becca
e10021c8b3 adding a README 2015-09-14 15:52:18 -05:00