Phil Ringnalda 49dd872168 Back out 3 changesets (bug 1119980) for emulator-l bustage ... CLOSED TREE Backed out changeset 12ce98475c6e (bug 1119980) Backed out changeset bdb8d05f8870 (bug 1119980) Backed out changeset a68a18840492 (bug 1119980)		2015-05-25 18:48:51 -07:00
..
crashtests	Bug 1157011 - Check line break suppression of BR frame from its parent frame. r=dholbert	2015-04-23 13:32:53 +12:00
test	Bug 1130935 part.11 Disable test_backspace_delete.xul due to bug 1163311 r=smontagu	2015-05-15 10:18:08 +09:00
AsyncScrollBase.cpp	Factor the guts of AsyncScroll into a base helper class. (bug 1139220 part 2, r=kgilbert)	2015-04-01 23:17:22 -07:00
AsyncScrollBase.h	Add explicit keyword to AsyncScrollBase constructor to fix static analysis build (bug 1139220 part 6, r=shu)	2015-04-03 18:33:51 +09:00
FrameChildList.cpp	…
FrameChildList.h	Bug 1048246 - Fix more bad implicit constructors in layout; r=roc	2014-08-07 19:48:38 -04:00
JustificationUtils.h	Bug 1120300 - Export WritingModes.h as mozilla/WritingModes.h. r=jfkthame	2015-03-26 18:29:31 +11:00
MathMLTextRunFactory.cpp	Bug 1067755 - Store relevant style data rather than style context pointers on transformed text runs. r=jdaggett	2015-02-10 21:30:25 +11:00
MathMLTextRunFactory.h	Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj	2015-03-21 12:28:04 -04:00
RubyUtils.cpp	Bug 1141931 part 7 - Move [Auto]RubyTextContainerArray to RubyUtils and merge RubyTextContainerIterator into AutoRubyTextContainerArray. r=dholbert	2015-04-08 11:22:34 +12:00
RubyUtils.h	Bug 1156222 - Check frame type instead of display type for ruby and simplify code. r=dholbert	2015-04-23 13:32:53 +12:00
ScrollVelocityQueue.cpp	Bug 945584: Part 5 - Implement ScrollVelocityQueue (v4 Patch), r=roc	2015-02-19 15:51:08 -08:00
ScrollVelocityQueue.h	Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj	2015-03-21 12:28:04 -04:00
ScrollbarActivity.cpp	Bug 957445: Part 3 - combines nsIScrollbarOwner with nsIScrollbarMediator, r=mats	2014-02-14 19:40:53 +13:00
ScrollbarActivity.h	Bug 1156632 - Remove unused forward class declarations - patch 5 - rdf, parser, layout and something else, r=ehsan	2015-04-22 08:29:22 +02:00
Selection.h	Bug 1148527 - Indentation fix after bug 1145631, r=ehsan	2015-03-27 18:52:19 +00:00
StickyScrollContainer.cpp	Bug 1128356 - Add template functions for common frame property destructors. r=dbaron	2015-02-04 15:22:27 -08:00
StickyScrollContainer.h	Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj	2015-03-21 12:28:04 -04:00
TextOverflow.cpp	Bug 1157951 patch 1 - Rename fields and variables in nsCharClipDisplayItem etc using VisIStart/End instead of left/right. r=roc	2015-04-29 08:18:53 +01:00
TextOverflow.h	Bug 1157951 patch 1 - Rename fields and variables in nsCharClipDisplayItem etc using VisIStart/End instead of left/right. r=roc	2015-04-29 08:18:53 +01:00
WritingModes.h	Bug 1130935 part.6 Selection change notification should have selection range and writing mode information r=smaug	2015-05-15 10:18:08 +09:00
broken-image.png	…
folder.png	…
frame-graph.py	…
frame-verify.js	…
jar.mn	…
loading-image.png	…
moz.build	Bug 1157835: Remove the MSVC_ENABLE_PGO flag from the build system. r=glandium	2015-04-27 19:59:27 -04:00
nsAbsoluteContainingBlock.cpp	Back out 3 changesets (bug 1119980) for emulator-l bustage	2015-05-25 18:48:51 -07:00
nsAbsoluteContainingBlock.h	Bug 1060985 - Fix more bad implicit constructors in layout; r=roc	2014-08-31 23:36:37 -04:00
nsAutoCopyListener.h	Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj	2015-03-21 12:28:04 -04:00
nsBRFrame.cpp	Bug 1157011 - Check line break suppression of BR frame from its parent frame. r=dholbert	2015-04-23 13:32:53 +12:00
nsBlockDebugFlags.h	Bug 789096 patch 7: Use logical coordinates in nsBlockReflowContext. r=jfkthame	2014-06-17 07:41:35 -07:00
nsBlockFrame.cpp	Bug 1167145 - Check result of PrevInFlow() before trying to call a method on it. r=dbaron	2015-05-22 08:49:30 +01:00
nsBlockFrame.h	Bug 1156632 - Remove unused forward class declarations - patch 5 - rdf, parser, layout and something else, r=ehsan	2015-04-22 08:29:22 +02:00
nsBlockReflowContext.cpp	Bug 1144501 - Take account of orthogonal writing modes when adjusting available size to reflow a child frame. r=smontagu	2015-04-07 15:35:30 +01:00
nsBlockReflowContext.h	Bug 1156632 - Remove unused forward class declarations - patch 5 - rdf, parser, layout and something else, r=ehsan	2015-04-22 08:29:22 +02:00
nsBlockReflowState.cpp	Bug 1150614: place floats correctly in vertical writing modes with dir="rtl", r=jfkthame	2015-05-03 01:33:31 -07:00
nsBlockReflowState.h	Bug 1143218 patch 3: a better fix for bug 1105137 using line-left and line-right to place floats, r=jfkthame	2015-03-22 11:44:48 +02:00
nsBulletFrame.cpp	Bug 1148833 part 3 - Remove nsIFrame::WillReflow and add a non-virtual MarkInReflow method instead that sets NS_FRAME_IN_REFLOW. Call it at the start of Reflow(). r=roc	2015-03-29 22:38:40 +00:00
nsBulletFrame.h	Bug 1148527 - Indentation fix after bug 1145631, r=ehsan	2015-03-27 18:52:19 +00:00
nsCanvasFrame.cpp	Bug 1021499 - Enlarge touch/selection carets touch area. r=roc	2015-04-15 19:15:00 -04:00
nsCanvasFrame.h	Bug 1148527 - Indentation fix after bug 1145631, r=ehsan	2015-03-27 18:52:19 +00:00
nsColumnSetFrame.cpp	Bug 1148833 part 3 - Remove nsIFrame::WillReflow and add a non-virtual MarkInReflow method instead that sets NS_FRAME_IN_REFLOW. Call it at the start of Reflow(). r=roc	2015-03-29 22:38:40 +00:00
nsColumnSetFrame.h	Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj	2015-03-21 12:28:04 -04:00
nsContainerFrame.cpp	Bug 1159305 - patch 2 - Clean up layout code by using the new accessors. r=smontagu	2015-05-11 11:37:46 +01:00
nsContainerFrame.h	Bug 1159772. Don't let nsContainerFrame::SyncWindowProperties make widget calls that can result in synchronous painting during reflow or frame construction. r=mats	2015-05-04 14:29:19 -05:00
nsDirection.h	…
nsFirstLetterFrame.cpp	Bug 1148833 part 3 - Remove nsIFrame::WillReflow and add a non-virtual MarkInReflow method instead that sets NS_FRAME_IN_REFLOW. Call it at the start of Reflow(). r=roc	2015-03-29 22:38:40 +00:00
nsFirstLetterFrame.h	Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj	2015-03-21 12:28:04 -04:00
nsFlexContainerFrame.cpp	Bug 1165667: Use reflow state's reference rendering context during flex layout, instead of creating a temporary one. r=mats	2015-05-21 18:35:16 -07:00
nsFlexContainerFrame.h	Bug 1158290 part 1: Use AvailableBSize instead of AvailableHeight, throughout flex layout. r=mats	2015-05-12 13:34:22 -07:00
nsFloatManager.cpp	Bug 1145218 - Make the float manager's writing-mode field debug-only, and assert that it matches what callers are passing in. r=smontagu	2015-04-01 16:43:58 +01:00
nsFloatManager.h	Bug 1145218 - Make the float manager's writing-mode field debug-only, and assert that it matches what callers are passing in. r=smontagu	2015-04-01 16:43:58 +01:00
nsFontInflationData.cpp	Bug 1138293 - Use malloc/free/realloc/calloc instead of moz_malloc/moz_free/moz_realloc/moz_calloc. r=njn	2015-03-31 12:32:49 +09:00
nsFontInflationData.h	Bug 1138495 - pt 3 - Compute font inflation based on inline-axis dimensions rather than always using physical width. r=smontagu	2015-03-10 14:28:23 +00:00
nsFrame.cpp	Back out 3 changesets (bug 1119980) for emulator-l bustage	2015-05-25 18:48:51 -07:00
nsFrame.h	Bug 1165518 - Part 2: Replace prlog.h with Logging.h. rs=froydnj	2015-05-19 11:15:34 -07:00
nsFrameIdList.h	Bug 1110056 - Merge nsMathMLmphantomFrame into nsMathMLmrowFrame. r=jkitch	2015-02-09 11:19:00 +01:00
nsFrameList.cpp	Bug 1111525 - Remove unused lineFlags returned by nsILineIterator. r=roc	2014-12-19 14:55:30 +00:00
nsFrameList.h	Bug 1143513 - Make nsFrameList compatible with range-based syntax and utils. r=roc,waldo	2015-03-31 14:08:17 +11:00
nsFrameSelection.h	Bug 1156632 - Remove unused forward class declarations - patch 5 - rdf, parser, layout and something else, r=ehsan	2015-04-22 08:29:22 +02:00
nsFrameSetFrame.cpp	Bug 1148833 part 3 - Remove nsIFrame::WillReflow and add a non-virtual MarkInReflow method instead that sets NS_FRAME_IN_REFLOW. Call it at the start of Reflow(). r=roc	2015-03-29 22:38:40 +00:00
nsFrameSetFrame.h	Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj	2015-03-21 12:28:04 -04:00
nsFrameState.cpp	Bug 1116037 part 2 - Use frame state bit to mark rtc of span. r=dbaron	2014-12-29 13:34:07 +11:00
nsFrameState.h	…
nsFrameStateBits.h	Bug 1138495 - pt 1 - Rename NS_FRAME_IN_CONSTRAINED_HEIGHT flag to NS_FRAME_IN_CONSTRAINED_BSIZE, and set it appropriately according to writing mode. r=smontagu	2015-03-10 14:28:23 +00:00
nsFrameUtil.cpp	Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj	2015-03-21 12:28:04 -04:00
nsGfxScrollFrame.cpp	Backed out changeset ce5f10e3c979 (bug 1164227) for B2G wordwrap-01.html timeouts.	2015-05-19 15:15:10 -04:00
nsGfxScrollFrame.h	Bug 1139306: Fix margin sides for right-to-left scrollbars depending on the actual position of the scrollbar as determined by layout.scrollbar.side, r=tn	2015-05-12 01:49:25 -07:00
nsGridContainerFrame.cpp	Bug 1161038 - [css-grid] Make kAutoLine not clash with translated grid lines. r=dholbert	2015-05-05 21:53:22 +00:00
nsGridContainerFrame.h	Bug 1146051 part 7 - [css-grid] Make LineRange::mStart/mEnd into a union with both a signed/unsigned members to make it clear when we're working with translated line numbers and when not. r=dholbert	2015-04-30 18:42:50 +00:00
nsHTMLCanvasFrame.cpp	Bug 1148833 part 3 - Remove nsIFrame::WillReflow and add a non-virtual MarkInReflow method instead that sets NS_FRAME_IN_REFLOW. Call it at the start of Reflow(). r=roc	2015-03-29 22:38:40 +00:00
nsHTMLCanvasFrame.h	Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj	2015-03-21 12:28:04 -04:00
nsHTMLParts.h	Bug 1159101 part 5 - Initialize writing mode of desired mode of table cell frame from its table frame on a CLOSED TREE. r=roc	2015-04-30 18:27:54 +12:00
nsHTMLReflowMetrics.cpp	…
nsHTMLReflowMetrics.h	Bug 1120300 - Export WritingModes.h as mozilla/WritingModes.h. r=jfkthame	2015-03-26 18:29:31 +11:00
nsHTMLReflowState.cpp	Bug 1159305 - patch 2 - Clean up layout code by using the new accessors. r=smontagu	2015-05-11 11:37:46 +01:00
nsHTMLReflowState.h	Bug 1156021 - Use containing block inline-size (as appropriate for writing mode) to compute text-indent when specified as percentage. r=dbaron	2015-04-19 19:03:27 +01:00
nsIAnonymousContentCreator.h	Bug 1156632 - Remove unused forward class declarations - patch 5 - rdf, parser, layout and something else, r=ehsan	2015-04-22 08:29:22 +02:00
nsIFrame.h	Bug 1156632 - Remove unused forward class declarations - patch 5 - rdf, parser, layout and something else, r=ehsan	2015-04-22 08:29:22 +02:00
nsIFrameInlines.h	Bug 1125767. Centralize code into nsStylePosition::IsFixedPosContainingBlock. r=mats	2015-03-12 16:21:01 +13:00
nsIFrameUtil.h	…
nsILineIterator.h	Bug 1111525 - Remove unused lineFlags returned by nsILineIterator. r=roc	2014-12-19 14:55:30 +00:00
nsIObjectFrame.h	…
nsIPageSequenceFrame.h	…
nsIScrollPositionListener.h	…
nsIScrollableFrame.h	Backed out 2 changesets (bug 969250) on the other theory that it broke lots of tests, forcing a prolonged CLOSED TREE	2015-03-25 14:46:47 -07:00
nsIStatefulFrame.h	…
nsImageFrame.cpp	Bug 1163878 (Part 2) - Use IsImageContainerAvailable() when making layerization decisions and only call GetImageContainer() if we layerize. r=tn	2015-05-13 00:23:46 -07:00
nsImageFrame.h	Bug 1163878 (Part 2) - Use IsImageContainerAvailable() when making layerization decisions and only call GetImageContainer() if we layerize. r=tn	2015-05-13 00:23:46 -07:00
nsImageMap.cpp	Bug 1134920 - Use moz_xmalloc/moz_xrealloc/free instead of nsMemory::Alloc/Realloc/Free. r=nfroyd	2015-04-01 13:51:45 +09:00
nsImageMap.h	Bug 1148527 - Indentation fix after bug 1145631, r=ehsan	2015-03-27 18:52:19 +00:00
nsInlineFrame.cpp	Bug 1153478 part 2 - Remove useless assertions. r=roc	2015-04-16 09:04:19 +00:00
nsInlineFrame.h	Bug 1153478 part 1 - Add nsInlineFrame::StealFrame and make it deal with being called on the wrong parent for aChild (due to lazy reparenting). r=roc	2015-04-16 09:04:19 +00:00
nsIntervalSet.cpp	…
nsIntervalSet.h	…
nsLeafFrame.cpp	Bug 1148833 part 3 - Remove nsIFrame::WillReflow and add a non-virtual MarkInReflow method instead that sets NS_FRAME_IN_REFLOW. Call it at the start of Reflow(). r=roc	2015-03-29 22:38:40 +00:00
nsLeafFrame.h	Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj	2015-03-21 12:28:04 -04:00
nsLineBox.cpp	Bug 1120300 - Export WritingModes.h as mozilla/WritingModes.h. r=jfkthame	2015-03-26 18:29:31 +11:00
nsLineBox.h	Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj	2015-03-21 12:28:04 -04:00
nsLineLayout.cpp	Bug 1146117 - Downgrade the assertion in FindNearestRubyBaseAncestor to warning. r=dbaron	2015-04-20 15:04:09 +12:00
nsLineLayout.h	Bug 1120300 - Export WritingModes.h as mozilla/WritingModes.h. r=jfkthame	2015-03-26 18:29:31 +11:00
nsPageContentFrame.cpp	Bug 1148833 part 3 - Remove nsIFrame::WillReflow and add a non-virtual MarkInReflow method instead that sets NS_FRAME_IN_REFLOW. Call it at the start of Reflow(). r=roc	2015-03-29 22:38:40 +00:00
nsPageContentFrame.h	Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj	2015-03-21 12:28:04 -04:00
nsPageFrame.cpp	Bug 1165515 - Part 1: Convert PR_LOG to MOZ_LOG. r=froydnj	2015-05-21 13:22:04 -07:00
nsPageFrame.h	Bug 1158546 - Remove nsDisplayHeaderFooter::mFrame in favor of nsDisplayItem::mFrame; r=roc	2015-04-27 08:10:29 -04:00
nsPlaceholderFrame.cpp	Bug 1148833 part 3 - Remove nsIFrame::WillReflow and add a non-virtual MarkInReflow method instead that sets NS_FRAME_IN_REFLOW. Call it at the start of Reflow(). r=roc	2015-03-29 22:38:40 +00:00
nsPlaceholderFrame.h	Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj	2015-03-21 12:28:04 -04:00
nsPluginFrame.cpp	Bug 1165515 - Part 1: Convert PR_LOG to MOZ_LOG. r=froydnj	2015-05-21 13:22:04 -07:00
nsPluginFrame.h	Bug 1156632 - Remove unused forward class declarations - patch 5 - rdf, parser, layout and something else, r=ehsan	2015-04-22 08:29:22 +02:00
nsQueryFrame.h	Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj	2015-03-21 12:28:04 -04:00
nsRubyBaseContainerFrame.cpp	Bug 1167189: Add an infallible version of nsContentUtils::GetNodeTextContent. r=jst	2015-05-22 14:16:20 -04:00
nsRubyBaseContainerFrame.h	Bug 1141931 part 7 - Move [Auto]RubyTextContainerArray to RubyUtils and merge RubyTextContainerIterator into AutoRubyTextContainerArray. r=dholbert	2015-04-08 11:22:34 +12:00
nsRubyBaseFrame.cpp	Bug 1120300 - Export WritingModes.h as mozilla/WritingModes.h. r=jfkthame	2015-03-26 18:29:31 +11:00
nsRubyBaseFrame.h	Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj	2015-03-21 12:28:04 -04:00
nsRubyContentFrame.cpp	Bug 1099807 part 2 - Implement intra-level whitespace pairing. r=dholbert	2015-01-08 18:28:09 +11:00
nsRubyContentFrame.h	Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj	2015-03-21 12:28:04 -04:00
nsRubyFrame.cpp	Bug 1141931 part 7 - Move [Auto]RubyTextContainerArray to RubyUtils and merge RubyTextContainerIterator into AutoRubyTextContainerArray. r=dholbert	2015-04-08 11:22:34 +12:00
nsRubyFrame.h	Bug 1156632 - Remove unused forward class declarations - patch 5 - rdf, parser, layout and something else, r=ehsan	2015-04-22 08:29:22 +02:00
nsRubyTextContainerFrame.cpp	Bug 1146103 followup - Add comment mentions upgrading warning and add crashtest for the assertion.	2015-03-31 16:30:29 +11:00
nsRubyTextContainerFrame.h	Bug 1141931 part 5 - Eliminate unnecessary includes in header files of ruby frames. r=dholbert	2015-04-08 11:22:34 +12:00
nsRubyTextFrame.cpp	Bug 1120300 - Export WritingModes.h as mozilla/WritingModes.h. r=jfkthame	2015-03-26 18:29:31 +11:00
nsRubyTextFrame.h	Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj	2015-03-21 12:28:04 -04:00
nsSelection.cpp	Bug 1110039 - Part 4 - Hook new classes into the system. r=roc	2015-04-24 02:08:00 +02:00
nsSimplePageSequenceFrame.cpp	Bug 1165515 - Part 1: Convert PR_LOG to MOZ_LOG. r=froydnj	2015-05-21 13:22:04 -07:00
nsSimplePageSequenceFrame.h	Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj	2015-03-21 12:28:04 -04:00
nsSplittableFrame.cpp	Bug 1028460 - part 4, Remove LOGICAL_SIDE* and use the LogicalSideBits enum values instead. r=roc	2014-06-28 10:13:14 +00:00
nsSplittableFrame.h	Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj	2015-03-21 12:28:04 -04:00
nsSubDocumentFrame.cpp	Bug 1075670 - Make event.screen[XY] work in content processes (r=smaug,kats,tn,joshmoz)	2015-04-01 12:36:41 -07:00
nsSubDocumentFrame.h	Bug 1075670 - Make event.screen[XY] work in content processes (r=smaug,kats,tn,joshmoz)	2015-04-01 12:36:41 -07:00
nsTextFrame.cpp	Bug 1149009 - Suppress line break inside text frame if it is directly contained by ruby content box. r=dbaron	2015-05-04 09:52:53 +12:00
nsTextFrame.h	Bug 1149009 - Suppress line break inside text frame if it is directly contained by ruby content box. r=dbaron	2015-05-04 09:52:53 +12:00
nsTextFrameUtils.cpp	Bug 1019555 - Treat newlines and tabs as space characters in SVG xml:space="preserve" text. r=roc	2014-06-05 13:25:15 +10:00
nsTextFrameUtils.h	Bug 1072106 - Be more careful about checking for spaces that should not have justification applied. r=roc	2014-09-24 18:10:56 +01:00
nsTextRunTransformations.cpp	Bug 1134216 - Preserve line-break flags properly when applying text-transform conversions. r=smontagu	2015-02-22 19:39:36 +00:00
nsTextRunTransformations.h	Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj	2015-03-21 12:28:04 -04:00
nsVideoFrame.cpp	Bug 1148833 part 3 - Remove nsIFrame::WillReflow and add a non-virtual MarkInReflow method instead that sets NS_FRAME_IN_REFLOW. Call it at the start of Reflow(). r=roc	2015-03-29 22:38:40 +00:00
nsVideoFrame.h	Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj	2015-03-21 12:28:04 -04:00
nsViewportFrame.cpp	Bug 1148833 part 3 - Remove nsIFrame::WillReflow and add a non-virtual MarkInReflow method instead that sets NS_FRAME_IN_REFLOW. Call it at the start of Reflow(). r=roc	2015-03-29 22:38:40 +00:00
nsViewportFrame.h	Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj	2015-03-21 12:28:04 -04:00