src: fix up after botched merge conflict
[platform/upstream/nodejs.git] / tools /
2013-09-24 Timothy J FontaineMerge remote-tracking branch 'upstream/v0.10'
2013-09-07 isaacsMerge remote-tracking branch 'ry/v0.10'
2013-09-06 isaacsMerge remote-tracking branch 'ry/v0.10'
2013-09-04 Timothy J FontaineMerge remote-tracking branch 'upstream/v0.10'
2013-09-01 isaacsMerge remote-tracking branch 'ry/v0.10'
2013-08-31 isaacsMerge remote-tracking branch 'ry/v0.10'
2013-08-28 isaacsMerge remote-tracking branch 'ry/v0.10'
2013-08-21 Timothy J Fontainetools: script release steps after jenkins build
2013-08-21 Timothy J Fontainetools: script to report [un]stable build
2013-08-21 isaacsMerge remote-tracking branch 'ry/v0.10'
2013-08-19 isaacsMerge remote-tracking branch 'ry/v0.10'
2013-08-17 isaacsMerge remote-tracking branch 'ry/v0.10'
2013-08-15 Ben Noordhuistools: cpplint: fix NOLINT(build/include_order)
2013-08-06 Timothy J FontaineMerge remote-tracking branch 'upstream/v0.10'
2013-08-05 Timothy J Fontainebuild: embed the mdb_v8.so into the binary
2013-07-31 Ben Noordhuistools: cpplint: fix up build/include_order rule
2013-07-31 Fedor Indutnycpplint: make lint rules closer to node's source
2013-07-30 Ben NoordhuisMerge remote-tracking branch 'origin/v0.10'
2013-07-24 Ben Noordhuistools: fix js2c macro expansion bug
2013-07-19 Ben Noordhuistools: make check-imports.sh work on bsd-likes
2013-07-18 isaacsMerge remote-tracking branch 'ry/v0.10'
2013-07-12 Timothy J FontaineMerge remote-tracking branch 'upstream/v0.10'
2013-07-09 isaacstools: Add next/prev version scripts
2013-07-06 Ben Noordhuistools: add check-imports.sh script
2013-07-05 Ben NoordhuisMerge remote-tracking branch 'origin/v0.10'
2013-06-25 isaacsMerge remote-tracking branch 'ry/v0.10' into master
2013-06-06 Timothy J Fontainebuild: add pkgsrc rule
2013-06-05 isaacsMerge remote-tracking branch 'ry/v0.10'
2013-05-31 isaacsMerge remote-tracking branch 'ry/v0.10'
2013-05-29 Ben NoordhuisMerge remote-tracking branch 'origin/v0.10'
2013-05-27 isaacsMerge remote-tracking branch 'ry/v0.10'
2013-05-23 Timothy J Fontainesystemtap: add tapset for node user probes
2013-05-20 isaacsMerge remote-tracking branch ry/v0.10 into master
2013-05-17 isaacsMerge remote-tracking branch 'ry/v0.10' into master
2013-05-14 isaacstools: remove unnecessary cpplint rules
2013-05-13 Bert BelderMerge branch 'v0.10'
2013-05-07 Timothy J Fontainetest: don't use total_seconds() because of py2.6
2013-05-07 Timothy J Fontainetest: don't use total_seconds() because of py2.6
2013-05-07 Timothy J Fontainetest: report test duration in TAP progress
2013-05-07 Timothy J Fontainetest: report test duration in TAP progress
2013-05-03 Bert BelderMerge branch 'v0.10'
2013-05-02 Ben NoordhuisMerge remote-tracking branch 'origin/v0.10'
2013-04-29 Ben Noordhuistools: fix test.py after v8 upgrade
2013-04-29 Ben NoordhuisMerge remote-tracking branch 'origin/v0.10'
2013-04-23 Olof Johanssoninstall: Support $(PREFIX) install target directory...
2013-04-12 Fedor IndutnyMerge branch 'v0.10'
2013-04-12 isaacsbuild: Typo in tools/msvs/msi/product.wxs
2013-03-25 Ben NoordhuisMerge remote-tracking branch 'origin/v0.10'
2013-03-25 Timothy J Fontainetest: test name is the last elem, not second
2013-03-24 Ben Noordhuistools: update gyp to r1601
2013-03-21 isaacsMerge remote-tracking branch 'ry/v0.10' into master
2013-03-20 Fedor Indutnydtrace: fix generation of v8 constants on freebsd
2013-03-20 Fedor Indutnydtrace: x64 ustack helper
2013-03-16 Ben Noordhuisinstall: don't install man page twice
2013-03-13 isaacsMerge remote-tracking branch 'ry/v0.10'
2013-03-09 isaacswin/msi: Fix typos
2013-03-09 isaacsMerge remote-tracking branch 'ry/v0.8' into master
2013-03-08 Bert Belderwin/msi: enable modify and repair
2013-03-08 Bert Belderwin/msi: miscellaneous style cleanups
2013-03-08 Bert Belderwin/msi: don't include architecture in start menu group...
2013-03-08 Bert Belderwin/msi: update 'install finished' message
2013-03-08 Bert Belderwin/msi: clean up the 'documentation shortcuts' feature
2013-03-08 Bert Belderwin/msi: refactor 'node.js runtime' feature
2013-03-08 Bert Belderwin/msi: make 'add to path' a separate feature
2013-03-08 Bert Belderwin/msi: separate features for ETW and perfctr support
2013-03-08 Bert Belderwin/msi: make npm a feature separate from the runtime
2013-03-08 Bert Belderwin/msi: use consistent registry key paths
2013-03-08 Bert Belderwin/msi: don't create empty npm folder in %appdata%
2013-03-08 Bert Belderwin/msi: don't install pdb file
2013-03-08 Bert Belderwin/msi: define features before directories/components
2013-03-08 Bert Belderwin: make nodejsvars.bat detect whether npm is available
2013-03-08 Raymond Fengwindows/msi: fix msi build issue with WiX 3.7/3.8
2013-03-06 isaacsMerge remote-tracking branch 'ry/v0.8' into master
2013-03-05 Ben NoordhuisMerge remote-tracking branch 'origin/v0.8'
2013-03-04 Bert Belderwin/msi: make msi build work when spaces are present...
2013-03-02 Ben NoordhuisMerge remote-tracking branch 'origin/v0.8'
2013-03-02 Raymond Fengwindows/msi: fix msi build issue with WiX 3.7/3.8
2013-03-01 isaacsblog: Do not pass undefined to path.join
2013-02-28 Ben NoordhuisMerge remote-tracking branch 'origin/v0.8'
2013-02-28 Timothy J Fontainetest: fix tap output on windows
2013-02-28 Ben NoordhuisMerge remote-tracking branch 'origin/v0.8'
2013-02-26 Fedor IndutnyRevert "sunos: unbreak build after v8 downgrade"
2013-02-26 Ben Noordhuissunos: unbreak build after v8 downgrade
2013-02-20 Timothy J Fontainetest: add TAP output to the test runner
2013-02-20 isaacsMerge branch 'benchmark-refactor-2'
2013-02-20 isaacstools: Add wrk for benchmarking http servers
2013-02-18 isaacsMerge remote-tracking branch 'ry/v0.8' into master
2013-02-07 Scott Blomquistwindows/msi: more installer enhancements
2013-02-07 Jim Schubertwindows/msi: add feature selection to installer
2013-02-07 isaacsMerge remote-tracking branch 'ry/v0.8' into master
2013-02-05 Ben Noordhuisblog: remove dangling symlink
2013-01-21 Fedor Indutnydtrace: fix generation of v8 constants on freebsd
2013-01-18 isaacsMerge remote-tracking branch 'ry/v0.8' into master
2013-01-15 Chris Dentinstall: add simplejson fallback
2013-01-11 Scott Blomquistwindows: add support for '_Total' perf counters
2013-01-11 isaacsMerge remote-tracking branch 'ry/v0.8' into master
2013-01-10 isaacsMerge branch 'v0.8.17-release' into v0.8
2013-01-10 Ben Noordhuistest: run tests in alphabetical order
2013-01-10 isaacs2012.01.09, Version 0.8.17 (Stable) v0.8.17
2013-01-08 Mike Harschbuild: fail w/err msg when missing binutils
next