projects / swc-sql.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b3eee8d 660c10b)
Merge branch 'master' into bc-namespaced bc-namespaced
authorW. Trevor King <wking@tremily.us>
Tue, 11 Mar 2014 17:37:07 +0000 (10:37 -0700)
committerW. Trevor King <wking@tremily.us>
Tue, 11 Mar 2014 17:37:07 +0000 (10:37 -0700)
commit77a591d5a0b490baa74b252399f46e8d6b567ad2
tree27ff4549735567f0c0e192ba47500af24da47665tree | snapshot
parentb3eee8d59322c1f5679443fe5282375e591a37cfcommit | diff
parent660c10b4c0526dfb19309e414841863859fb959ccommit | diff
Merge branch 'master' into bc-namespaced

This is a no-op merge, explicitly considering and rejecting the
de-namespacing from the master branch.  After this merge, future
merges from the master branch will pick up any content changes.

  $ git merge --log --no-ff --strategy ours master

* master:
  *.ipynb: Use absolute URLs to link to the glossary
  index.md: Remove YAML front-matter
  Remove novice/sql namespace
SQL tool-level material (in SQLite) for Software Carpentry