diff options
| author | Johann Klähn <kljohann@gmail.com> | 2013-01-18 18:26:03 +0100 |
|---|---|---|
| committer | Johann Klähn <kljohann@gmail.com> | 2013-01-18 18:26:03 +0100 |
| commit | b3b11bed3be9c7a6dcd4a4427eb02fa7d92f34ed (patch) | |
| tree | cd5008b6a42cd65c9fe668a92e10237fcec335c4 /doc/CMakeLists.txt | |
| parent | 83bd3234d32d7a82d583e4f50f8f90837aa15a93 (diff) | |
| parent | 385cbd25b9905b16a4c7723bb4e5a5813e84aab0 (diff) | |
| download | fork-ledger-b3b11bed3be9c7a6dcd4a4427eb02fa7d92f34ed.tar.gz fork-ledger-b3b11bed3be9c7a6dcd4a4427eb02fa7d92f34ed.tar.bz2 fork-ledger-b3b11bed3be9c7a6dcd4a4427eb02fa7d92f34ed.zip | |
Merge branch 'master' into next
Some commits were on the master branch but not yet on the next branch due to a
pull request to master after those two branches diverged. This merge
ensures that next ⊇ master.
Diffstat (limited to 'doc/CMakeLists.txt')
0 files changed, 0 insertions, 0 deletions