Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
json
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
json
Commits
84bffd5d
Unverified
Commit
84bffd5d
authored
Jan 13, 2018
by
Théo DELRIEU
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move amalgamate tool to third_party folder
parent
922b56e4
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
1 addition
and
2 deletions
+1
-2
.gitignore
.gitignore
+0
-1
Makefile
Makefile
+1
-1
third_party/amalgamate/CHANGES.md
third_party/amalgamate/CHANGES.md
+0
-0
third_party/amalgamate/LICENSE.md
third_party/amalgamate/LICENSE.md
+0
-0
third_party/amalgamate/README.md
third_party/amalgamate/README.md
+0
-0
third_party/amalgamate/amalgamate.py
third_party/amalgamate/amalgamate.py
+0
-0
third_party/amalgamate/config.json
third_party/amalgamate/config.json
+0
-0
No files found.
.gitignore
View file @
84bffd5d
...
@@ -21,4 +21,3 @@ benchmarks/files/numbers/*.json
...
@@ -21,4 +21,3 @@ benchmarks/files/numbers/*.json
cmake-build-debug
cmake-build-debug
test/test-*
test/test-*
third_party/Amalgamate
Makefile
View file @
84bffd5d
...
@@ -252,7 +252,7 @@ pretty:
...
@@ -252,7 +252,7 @@ pretty:
amalgamate
:
src/json.hpp
amalgamate
:
src/json.hpp
src/json.hpp
:
$(SRCS)
src/json.hpp
:
$(SRCS)
develop/amalgamate/amalgamate.py
-c
develop
/amalgamate/config.json
-s
develop
--verbose
=
yes
third_party/amalgamate/amalgamate.py
-c
third_party
/amalgamate/config.json
-s
develop
--verbose
=
yes
$(MAKE)
pretty
$(MAKE)
pretty
...
...
develop
/amalgamate/CHANGES.md
→
third_party
/amalgamate/CHANGES.md
View file @
84bffd5d
File moved
develop
/amalgamate/LICENSE.md
→
third_party
/amalgamate/LICENSE.md
View file @
84bffd5d
File moved
develop
/amalgamate/README.md
→
third_party
/amalgamate/README.md
View file @
84bffd5d
File moved
develop
/amalgamate/amalgamate.py
→
third_party
/amalgamate/amalgamate.py
100755 → 100644
View file @
84bffd5d
File moved
develop
/amalgamate/config.json
→
third_party
/amalgamate/config.json
View file @
84bffd5d
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment