Merge branch 'master' into pentool

Conflicts:
	manifest.json

3 files changed, 4 insertions, 3 deletions

diff --git a/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css b/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css
index 8e45305a..cb119a14 100644
--- a/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css
+++ b/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css
@@ -3,17 +3,17 @@
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
-
 /* PropertyTrack.scss
  * Main SCSS file for PropertyTrack component, compiled by SASS into the file css/PropertyTrack.css.
  */
-/* line 13, ../scss/PropertyTrack.scss */
+/* line 19, ../scss/PropertyTrack.scss */
 .content-main .collapsible-content .timeline-track {
   height: 20px;
   border-bottom: 1px solid #505050;
+  background-image: url("../images/gridline.jpg");
 }
 
-/* line 19, ../scss/PropertyTrack.scss */
+/* line 26, ../scss/PropertyTrack.scss */
 .timeline-track .content-main {
   background-color: #474747;
 }
diff --git a/js/panels/Timeline/PropertyTrack.reel/images/gridline.jpg b/js/panels/Timeline/PropertyTrack.reel/images/gridline.jpg
new file mode 100644
index 00000000..9f451b0a
--- /dev/null
+++ b/js/panels/Timeline/PropertyTrack.reel/images/gridline.jpg
diff --git a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
index 273e3d77..c7ae6f0c 100644
--- a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
+++ b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
@@ -19,6 +19,7 @@
 .content-main .collapsible-content .timeline-track {
         height: 20px;
         border-bottom: 1px solid $color-menu-divider;
+    background-image: url("../images/gridline.jpg");
  }