diff options
| author | Craig Earls <enderw88@gmail.com> | 2013-08-20 09:58:39 -0700 |
|---|---|---|
| committer | Craig Earls <enderw88@gmail.com> | 2013-08-20 09:58:39 -0700 |
| commit | 9f3afc26f5e7863ed8beac3a411dab8becc7bff9 (patch) | |
| tree | 761f904707d52a0b2860a4df224caa4eb3b5481e /.gitignore | |
| parent | 8b84aff855963b96c096e4338b4ff5cd6e2d2e68 (diff) | |
| parent | 46bf142b2a9252c08a13f3878976361bc898f4c5 (diff) | |
| download | fork-ledger-9f3afc26f5e7863ed8beac3a411dab8becc7bff9.tar.gz fork-ledger-9f3afc26f5e7863ed8beac3a411dab8becc7bff9.tar.bz2 fork-ledger-9f3afc26f5e7863ed8beac3a411dab8becc7bff9.zip | |
Merge branch 'master' into ledger-mode-automatic-transactions
Conflicts:
lisp/ledger-reconcile.el
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -106,3 +106,7 @@ contrib/non-profit-audit-reports/tests/general-ledger.txt contrib/non-profit-audit-reports/tests/MANIFEST contrib/non-profit-audit-reports/general-ledger.zip /wiki/ +doc/ledger-mode.info +doc/ledger3.info-1 +doc/ledger3.info-2 +CTestTestfile.cmake |