You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by de...@apache.org on 2014/03/18 16:09:58 UTC
[03/12] couchdb commit: updated refs/heads/2129-config-edit-name to
673100c
fix build
add CONTRIBUTING.md to Makefile.am and license.skip
remove duplicate file from Makefile.am
This closes #184
Signed-off-by: Alexander Shorin <kx...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/c81f2d47
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/c81f2d47
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/c81f2d47
Branch: refs/heads/2129-config-edit-name
Commit: c81f2d470d73051617e0395f771c9f364e3f2e47
Parents: 510070c
Author: Robert Kowalski <ro...@kowalski.gd>
Authored: Sun Mar 16 15:35:35 2014 +0100
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Mar 17 00:29:31 2014 +0400
----------------------------------------------------------------------
license.skip | 1 +
src/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c81f2d47/license.skip
----------------------------------------------------------------------
diff --git a/license.skip b/license.skip
index 984d869..56b48bd 100644
--- a/license.skip
+++ b/license.skip
@@ -140,6 +140,7 @@
^src/fauxton/readme.md
^src/fauxton/writing_addons.md
^src/fauxton/TODO.md
+^src/fauxton/CONTRIBUTING.md
^src/fauxton/settings.json.*
^src/fauxton/test/test.config.underscore
^src/fauxton/test/mocha/chai.js
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c81f2d47/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index 43afcf5..f610a31 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -70,7 +70,6 @@ FAUXTON_FILES = \
fauxton/app/addons/config/resources.js \
fauxton/app/addons/config/views.js \
fauxton/app/addons/config/routes.js \
- fauxton/app/addons/config/views.js \
fauxton/app/addons/config/templates/modal.html \
fauxton/app/addons/config/templates/dashboard.html \
fauxton/app/addons/config/templates/item.html \
@@ -346,4 +345,5 @@ FAUXTON_FILES = \
fauxton/test/runner.html \
fauxton/test/test.config.underscore \
fauxton/TODO.md \
+ fauxton/CONTRIBUTING.md \
fauxton/writing_addons.md