[Commits] [marklogic/RunDMC] b2c48a: Merge branch 'adam-code'

[noreply at github.com]

  Branch: refs/heads/master
  Home:   https://github.com/marklogic/RunDMC

  Commit: b2c48a32ff71a04b75b5c472bc0c80cbefa84a14
      https://github.com/marklogic/RunDMC/commit/b2c48a32ff71a04b75b5c472bc0c80cbefa84a14
  Author: Evan Lenz <evan at evanlenz.net>
  Date:   2011-10-26 (Wed, 26 Oct 2011)

  Changed paths:
    M css/screen.css
  M css/screen_ie.css
  A images/i_meetup_lg.png
  A images/i_notepad.png
  A images/i_visualtools.png
  A images/logo_hadoop.png
  A images/logo_marklogic5.png
  M images/s_plusminus_dark.png
  M images/s_plusminus_light.png
  M js/functions.js

  Log Message:
  -----------
  Merge branch 'adam-code'

Conflicts:
	config/template.xhtml
	css/screen.css


  Commit: e6ab211c3d97d09f83ec225d24fed112b8da56a2
      https://github.com/marklogic/RunDMC/commit/e6ab211c3d97d09f83ec225d24fed112b8da56a2
  Author: Evan Lenz <evan at evanlenz.net>
  Date:   2011-10-26 (Wed, 26 Oct 2011)

  Changed paths:
    A lib/mljson/LICENSE.txt
  A lib/mljson/README.markdown
  A lib/mljson/lib/date-parser.xqy
  A lib/mljson/lib/json.xqy
  A lib/mljson/lib/path-parser.xqy
  A lib/mljson/samples/app.js
  A lib/mljson/samples/css/style.css
  A lib/mljson/samples/index.html
  A lib/mljson/samples/js/app.js
  A lib/mljson/samples/js/jquery-1.4.2.min.js
  A lib/mljson/samples/save.html
  A lib/mljson/test/css/qunit.css
  A lib/mljson/test/dateparser.html
  A lib/mljson/test/index.html
  A lib/mljson/test/js/dateparser-tests.js
  A lib/mljson/test/js/jquery.js
  A lib/mljson/test/js/mljson-tests.js
  A lib/mljson/test/js/path-parser-tests.js
  A lib/mljson/test/js/qunit.js
  A lib/mljson/test/mljson.html
  A lib/mljson/test/path-parser.html
  A lib/mljson/test/xq/array-construction.xqy
  A lib/mljson/test/xq/isomorphic.xqy
  A lib/mljson/test/xq/object-construction-dup-keys.xqy
  A lib/mljson/test/xq/object-construction.xqy
  A lib/mljson/test/xq/parsedate.xqy
  A lib/mljson/test/xq/parsepath.xqy

  Log Message:
  -----------
  Merge branch 'master' of github.com:marklogic/RunDMC


Compare: https://github.com/marklogic/RunDMC/compare/6c60615...e6ab211