diff options
author | Jeff Garzik <jgarzik@bitpay.com> | 2014-08-19 00:49:31 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@bitpay.com> | 2014-08-19 00:49:31 -0400 |
commit | 03673295496888839bc928c59f4291b6e2b2fbb1 (patch) | |
tree | 2e0f971a5ccde662d538ae301dcfea151e29facf /.gitignore | |
parent | a4f151f714d67da7850d94d44b824944d3f0d74d (diff) | |
parent | 3cceba7abb22133fcaea8d4f7aaed345f0e48009 (diff) |
Merge branch '2014_univalue_warn' into merge-PR4715
Merge pull request #4715
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index e21ea92552..25c0dff660 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,8 @@ src/m4/ltsugar.m4 src/m4/ltversion.m4 src/m4/lt~obsolete.m4 +src/univalue/gen + src/qt/*.moc src/qt/moc_*.cpp src/qt/forms/ui_*.h |