diff options
author | John Wiegley <johnw@newartisans.com> | 2009-11-08 13:36:21 -0500 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2009-11-08 13:36:21 -0500 |
commit | 55c7792c9329f97dd19fc5aeca466cb2de4fbf9c (patch) | |
tree | b820b7c4b064e5d430439839768aa5b855ce3a4a /src/journal.h | |
parent | 3f00f8362c2fdfae1dbb6517bc29c75e308bc4f0 (diff) | |
parent | 60059750061fe59c83adc869f36335a083955608 (diff) | |
download | fork-ledger-55c7792c9329f97dd19fc5aeca466cb2de4fbf9c.tar.gz fork-ledger-55c7792c9329f97dd19fc5aeca466cb2de4fbf9c.tar.bz2 fork-ledger-55c7792c9329f97dd19fc5aeca466cb2de4fbf9c.zip |
Merge branch 'next'
Diffstat (limited to 'src/journal.h')
-rw-r--r-- | src/journal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/journal.h b/src/journal.h index e2af0dde..ff2b5f84 100644 --- a/src/journal.h +++ b/src/journal.h @@ -115,7 +115,7 @@ public: }; account_t * master; - account_t * basket; + account_t * bucket; xacts_list xacts; auto_xacts_list auto_xacts; period_xacts_list period_xacts; @@ -202,7 +202,7 @@ private: template<class Archive> void serialize(Archive& ar, const unsigned int /* version */) { ar & master; - ar & basket; + ar & bucket; ar & xacts; ar & auto_xacts; ar & period_xacts; |