From: Brandon Aaron <brandon.aaron@gmail.com>
Date: Wed, 24 Mar 2010 03:40:38 +0000 (-0500)
Subject: Merge branch 'master' of github.com:jquery/jquery
X-Git-Tag: 1.4.3rc1~168
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=efea0f23f9e0f147c5ff5b5d35249417c32c3a53;p=jquery.git

Merge branch 'master' of github.com:jquery/jquery
---

efea0f23f9e0f147c5ff5b5d35249417c32c3a53
diff --cc test/data/offset/absolute.html
index 2a7eb73e5,bbd4681b1..dc0ba22f2
--- a/test/data/offset/absolute.html
+++ b/test/data/offset/absolute.html
@@@ -13,8 -13,16 +13,17 @@@
  			#absolute-2 { top: 19px; left: 19px; }
  			#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
  			p.instructions { position: absolute; bottom: 0; }
 +			#positionTest { position: absolute; }
  		</style>
+ 		<script src="../../../src/core.js"></script>
+ 		<script src="../../../src/support.js"></script>
+ 		<script src="../../../src/sizzle/sizzle.js"></script>
+ 		<script src="../../../src/sizzle-jquery.js"></script>
+ 		<script src="../../../src/traversing.js"></script>
+ 		<script src="../../../src/data.js"></script>
+ 		<script src="../../../src/event.js"></script>
+ 		<script src="../../../src/css.js"></script>
+ 		<script src="../../../src/offset.js"></script>
  		<script type="text/javascript" src="../../../dist/jquery.js"></script>
  		<script type="text/javascript" charset="utf-8">
  			$(function() {