Feb 4, 2008 |
16 years 11 months | explicit merge of '38aa7c09830a7046e8ee5b15c3bc9011f244a170' |
16 years 11 months | explicit merge of 'abda2422ff31ad3518b334fdd9645e246f847c01' |
16 years 11 months | * vocab.hh: removed the hexenc< > part from revision_id,
manifest_id, |
16 years 11 months | propagate from branch 'net.venge.monotone' (head
cba5427fbb4d8aaa53f29145a0118ae40d4292a9) |
16 years 11 months | In the testsuite, pass --confdir and --file arguments |
16 years 11 months | merge of '299aa7073f4bd8e4812c19d447d6a6a0622b86a5' |
16 years 11 months | * Added test update_with_pending_modification, which covers bug |
16 years 11 months | New merge_update_part_of_file test |
16 years 11 months | propagate from branch 'net.venge.monotone.experiment.encapsulation'
(head f8770ea0da55da4c731c9e5523d7d12af285ea46) |
16 years 11 months | propagate from branch 'net.venge.monotone' (head
59f939d5f1dd78058ba7b8752b110d76705d74da) |
16 years 11 months | Botan has a built-in RAII object for initializing the library. |
16 years 11 months | Use branch_uid/committer for delegations also, a delegation |
Feb 3, 2008 |
16 years 11 months | merge of '3bbedf0e4bf713d07a848d4fe262720b8b174aa6' |
16 years 11 months | * key_store.cc (hook_get_current_branch_key, has_opt_signing_key) |
16 years 11 months | branch_id is now branch_uid, since we tend to use id for things that
are hashes |
16 years 11 months | branch_id is now branch_uid, since we tend to use id for things that
are hashes |
16 years 11 months | branch_id is now branch_uid, since we tend to use id for things that
are hashes |
16 years 11 months | branch_id is now branch_uid, since we tend to use id for things that
are hashes |
Feb 2, 2008 |
16 years 11 months | Got the Change Log window working the way I want. |
16 years 11 months | * database.cc: removed inclusion of app_state.hh, instead include |