]> source.dussan.org Git - jquery.git/log
jquery.git
13 years agoTagging the 1.6rc1 release. 1.6rc1
John Resig [Tue, 26 Apr 2011 20:21:45 +0000 (16:21 -0400)]
Tagging the 1.6rc1 release.

13 years agoMerged pull request #348 from rwldrn/8978.
Julian Aubourg [Tue, 26 Apr 2011 14:08:14 +0000 (07:08 -0700)]
Merged pull request #348 from rwldrn/8978.

jQuery.support core style guide correction. Fixes #8978

13 years agojQuery.support core style guide correction. Fixes #8978 348/head
Rick Waldron [Tue, 26 Apr 2011 13:45:27 +0000 (09:45 -0400)]
jQuery.support core style guide correction. Fixes #8978

13 years agoMerged pull request #345 from rwldrn/8971.
timmywil [Mon, 25 Apr 2011 19:53:43 +0000 (12:53 -0700)]
Merged pull request #345 from rwldrn/8971.

No need to test for widows & orphans values in IE6-8. Fixes #8971

13 years agoNo need to test for widows & orphans values in IE6-8. Fixes #8971 345/head
rwldrn [Mon, 25 Apr 2011 17:10:23 +0000 (13:10 -0400)]
No need to test for widows & orphans values in IE6-8. Fixes #8971

13 years agoAdd tests data- and aria- attributes and the autofocus boolean attribute and some...
timmywil [Sat, 23 Apr 2011 21:07:31 +0000 (17:07 -0400)]
Add tests data- and aria- attributes and the autofocus boolean attribute and some style updates in jQuery.attr

13 years agohandle data- and aria- special
aFarkas [Sat, 23 Apr 2011 19:57:55 +0000 (21:57 +0200)]
handle data- and aria- special

13 years agodealing with boolean content attribute
aFarkas [Sat, 23 Apr 2011 09:29:07 +0000 (11:29 +0200)]
dealing with boolean content attribute

13 years agoLanding pull request 344. using jQuery.nodeName where applicable.
Jordan Boesch [Sat, 23 Apr 2011 21:58:56 +0000 (17:58 -0400)]
Landing pull request 344. using jQuery.nodeName where applicable.

More Details:
 - https://github.com/jquery/jquery/pull/344

13 years agoSwitch the form nodeName check in attr to use jQuery.nodeName for consistency
timmywil [Sat, 23 Apr 2011 17:56:51 +0000 (13:56 -0400)]
Switch the form nodeName check in attr to use jQuery.nodeName for consistency

13 years agoDisabling .add(form.elements) unit test.
John Resig [Fri, 22 Apr 2011 04:51:23 +0000 (00:51 -0400)]
Disabling .add(form.elements) unit test.

13 years agoMerge branch 'master' of github.com:jquery/jquery
timmywil [Fri, 22 Apr 2011 04:28:11 +0000 (00:28 -0400)]
Merge branch 'master' of github.com:jquery/jquery

13 years agoCombine the support tests for radioValue and appendChecked
timmywil [Fri, 22 Apr 2011 04:27:52 +0000 (00:27 -0400)]
Combine the support tests for radioValue and appendChecked

13 years agoLanding pull request 340. Adds widows, orphans to cssNumber hash; includes tests...
Rick Waldron [Fri, 22 Apr 2011 04:02:08 +0000 (00:02 -0400)]
Landing pull request 340. Adds widows, orphans to cssNumber hash; includes tests. Fixes #8936.

More Details:
 - https://github.com/jquery/jquery/pull/340
 - http://bugs.jquery.com/ticket/8936

13 years agoMerge branch 'master' of github.com:jquery/jquery into fix-8790a-quicker-trigger
Dave Methvin [Fri, 22 Apr 2011 02:15:21 +0000 (22:15 -0400)]
Merge branch 'master' of github.com:jquery/jquery into fix-8790a-quicker-trigger

13 years agoLanding pull request 332. Appending disconnected radio or checkbox inputs and keeping...
timmywil [Fri, 22 Apr 2011 01:51:23 +0000 (21:51 -0400)]
Landing pull request 332. Appending disconnected radio or checkbox inputs and keeping checked setting Fixes #8060, #8500.

More Details:
 - https://github.com/jquery/jquery/pull/332
 - http://bugs.jquery.com/ticket/8060
 - http://bugs.jquery.com/ticket/8500

13 years agoLanding pull request [337](https://github.com/jquery/jquery/pull/337). Value of radio...
timmywil [Fri, 22 Apr 2011 01:33:09 +0000 (21:33 -0400)]
Landing pull request [337](https://github.com/jquery/jquery/pull/337). Value of radio inputs resets when type is set after the value in all IEs. Fixes #8570 ([bug](http://bugs.jquery.com/ticket/8570)).

13 years agoUpdate Sizzle and QUnit
timmywil [Thu, 21 Apr 2011 17:03:19 +0000 (13:03 -0400)]
Update Sizzle and QUnit

13 years agoMakes sure no unload handler is bound when not in IE. Also simplifies the whole ...
jaubourg [Thu, 21 Apr 2011 16:43:40 +0000 (18:43 +0200)]
Makes sure no unload handler is bound when not in IE. Also simplifies the whole "on unload abort" code. Also avoids the declaration of yet another variables in the jQuery main closure for the temporary XHR used to assess support properties.

13 years agoUpdating Sizzle and QUnit.
jeresig [Wed, 20 Apr 2011 23:08:29 +0000 (19:08 -0400)]
Updating Sizzle and QUnit.

13 years agoFollow w3c standard for setting the common boolean attributes to the same name(select...
timmywil [Tue, 19 Apr 2011 21:48:07 +0000 (17:48 -0400)]
Follow w3c standard for setting the common boolean attributes to the same name(selected, checked, readOnly, and disabled)

13 years agoFix test suite fails for hiding text nodes in F4 and IE9. Update for #6135.
timmywil [Tue, 19 Apr 2011 17:45:01 +0000 (13:45 -0400)]
Fix test suite fails for hiding text nodes in F4 and IE9. Update for #6135.

13 years agoOnly use getAttributeNode on buttons when setting value
timmywil [Tue, 19 Apr 2011 17:17:38 +0000 (13:17 -0400)]
Only use getAttributeNode on buttons when setting value

13 years ago(Re) Fixes #8884 in a way that keeps the format of the headers map sent to transports...
jaubourg [Tue, 19 Apr 2011 07:29:20 +0000 (00:29 -0700)]
(Re) Fixes #8884 in a way that keeps the format of the headers map sent to transports natural.

13 years agoDRY out #6514 333/head
Rick Waldron [Sun, 17 Apr 2011 22:29:49 +0000 (15:29 -0700)]
DRY out #6514

13 years agoMerge branch 'master' of github.com:jquery/jquery
timmywil [Sun, 17 Apr 2011 22:18:40 +0000 (18:18 -0400)]
Merge branch 'master' of github.com:jquery/jquery

13 years agoFix value attribute and val for value on button elements. Fixes #1954
timmywil [Sun, 17 Apr 2011 22:15:20 +0000 (18:15 -0400)]
Fix value attribute and val for value on button elements. Fixes #1954

13 years agoRemove unnecessary usage of Function.prototype.bind (#7783) but maintain API. Also...
John Resig [Sun, 17 Apr 2011 21:11:40 +0000 (14:11 -0700)]
Remove unnecessary usage of Function.prototype.bind (#7783) but maintain API. Also fix bug with proxy failing when a name is provided. Fixes #8893.

13 years agoUpdating UglifyJS.
John Resig [Sun, 17 Apr 2011 20:28:36 +0000 (13:28 -0700)]
Updating UglifyJS.

13 years agoFix live mouseenter and mouseleave binding so they can be activated by triggers....
Brian Brennan [Sun, 17 Apr 2011 18:58:20 +0000 (11:58 -0700)]
Fix live mouseenter and mouseleave binding so they can be activated by triggers. Fixes #6514.

13 years agoRemove unnecessary usage of Function.prototype.bind (#7783) but maintain API. Also...
John Resig [Sun, 17 Apr 2011 21:11:40 +0000 (14:11 -0700)]
Remove unnecessary usage of Function.prototype.bind (#7783) but maintain API. Also fix bug with proxy failing when a name is provided. Fixes #8893.

13 years agoUpdating UglifyJS.
John Resig [Sun, 17 Apr 2011 20:28:36 +0000 (13:28 -0700)]
Updating UglifyJS.

13 years agoMerge branch 'master' of github.com:jquery/jquery
John Resig [Sun, 17 Apr 2011 18:58:58 +0000 (11:58 -0700)]
Merge branch 'master' of github.com:jquery/jquery

13 years agoFix live mouseenter and mouseleave binding so they can be activated by triggers....
Brian Brennan [Sun, 17 Apr 2011 18:58:20 +0000 (11:58 -0700)]
Fix live mouseenter and mouseleave binding so they can be activated by triggers. Fixes #6514.

13 years agoUpdate Sizzle - qunit-fixture changes
timmywil [Sun, 17 Apr 2011 18:25:16 +0000 (14:25 -0400)]
Update Sizzle - qunit-fixture changes

13 years agoMerge branch 'qunit_fixture'
timmywil [Sun, 17 Apr 2011 18:12:31 +0000 (14:12 -0400)]
Merge branch 'qunit_fixture'

13 years agoUpdate QUnit, fix visibility of #dl and pass JSLint in effects.js
timmywil [Sun, 17 Apr 2011 18:08:52 +0000 (14:08 -0400)]
Update QUnit, fix visibility of #dl and pass JSLint in effects.js

13 years agoMake sure that hide or show don't fail when operating on non-Element nodes. Fixes...
John Resig [Sun, 17 Apr 2011 18:07:42 +0000 (11:07 -0700)]
Make sure that hide or show don't fail when operating on non-Element nodes. Fixes #6135.

13 years agoMake sure that forms and selects are added to a jQuery set correctly. Fixes #6912.
John Resig [Sun, 17 Apr 2011 17:51:24 +0000 (10:51 -0700)]
Make sure that forms and selects are added to a jQuery set correctly. Fixes #6912.

13 years agoAdded check for live mouseenter/mouseleave events if bound to nested elements with...
Gilmore Davidson [Sun, 17 Apr 2011 17:34:38 +0000 (10:34 -0700)]
Added check for live mouseenter/mouseleave events if bound to nested elements with the same selector. Fixes #5884.

13 years agoMake sure that there isn't an error if no event object exists. Fixes #8755.
John Resig [Sun, 17 Apr 2011 17:21:46 +0000 (10:21 -0700)]
Make sure that there isn't an error if no event object exists. Fixes #8755.

13 years agoSwitch QUnit div from depreceted #main to #qunit-fixture
timmywil [Sun, 17 Apr 2011 06:43:57 +0000 (02:43 -0400)]
Switch QUnit div from depreceted #main to #qunit-fixture

13 years agoFollow-up to #8790. Delay the creation of a jQuery.Event until we know it will need...
Dave Methvin [Sun, 17 Apr 2011 00:48:27 +0000 (20:48 -0400)]
Follow-up to #8790. Delay the creation of a jQuery.Event until we know it will need to be triggered.

13 years agoAdd in unit tests for #6993.
John Resig [Sun, 17 Apr 2011 00:39:30 +0000 (17:39 -0700)]
Add in unit tests for #6993.

13 years agoAllow function to be passed in as a data object to bind and one. Fixes #6993.
John Resig [Sun, 17 Apr 2011 00:37:35 +0000 (17:37 -0700)]
Allow function to be passed in as a data object to bind and one. Fixes #6993.

13 years agoCache references to navigator and location. Fixes #6690.
John Resig [Sat, 16 Apr 2011 21:18:56 +0000 (14:18 -0700)]
Cache references to navigator and location. Fixes #6690.

13 years agoMerge branch 'cellpadding_support' of https://github.com/timmywil/jquery into timmywi...
John Resig [Sat, 16 Apr 2011 16:17:34 +0000 (09:17 -0700)]
Merge branch 'cellpadding_support' of https://github.com/timmywil/jquery into timmywil-cellpadding_support

13 years agoMerge branch 'effectsCleanup' of https://github.com/louisremi/jquery into louisremi...
John Resig [Sat, 16 Apr 2011 16:16:45 +0000 (09:16 -0700)]
Merge branch 'effectsCleanup' of https://github.com/louisremi/jquery into louisremi-effectsCleanup

13 years agoBacking out fix for #6481.
John Resig [Sat, 16 Apr 2011 16:12:53 +0000 (09:12 -0700)]
Backing out fix for #6481.

13 years agoRemoves now unnecessary regexp and companion function. Fixes some spacing issues...
jaubourg [Fri, 15 Apr 2011 21:16:43 +0000 (14:16 -0700)]
Removes now unnecessary regexp and companion function. Fixes some spacing issues. Shortens field names.

13 years agoFixing code styling typo. 330/head
Sam Bisbee [Fri, 15 Apr 2011 20:45:45 +0000 (16:45 -0400)]
Fixing code styling typo.

13 years agoContinuing to map request headers using their name in uppercase for the index, but...
Sam Bisbee [Fri, 15 Apr 2011 20:36:43 +0000 (16:36 -0400)]
Continuing to map request headers using their name in uppercase for the index, but we now map to an object with an unmodified name and value: { name: "", value: "" }. This prevents overwriting of the user's supplied headers, which many applications parse with case sensitivity, because we no longer use the modified, uppercase index when building the request.

13 years agoremoving regex 329/head
Jordan Boesch [Fri, 15 Apr 2011 14:53:37 +0000 (08:53 -0600)]
removing regex

13 years agoundefined should be as good as null here 326/head
louisremi [Fri, 15 Apr 2011 14:33:21 +0000 (16:33 +0200)]
undefined should be as good as null here

13 years agorevert to old code, bug is invalid
Jordan Boesch [Fri, 15 Apr 2011 13:48:50 +0000 (07:48 -0600)]
revert to old code, bug is invalid

13 years agotypo
louisremi [Fri, 15 Apr 2011 13:30:19 +0000 (15:30 +0200)]
typo

13 years agoremove more useless code. feels good.
louisremi [Fri, 15 Apr 2011 13:18:21 +0000 (15:18 +0200)]
remove more useless code. feels good.

13 years ago- merge master
louisremi [Fri, 15 Apr 2011 12:44:55 +0000 (14:44 +0200)]
- merge master
- move private functions at the bottom
- remove duplicate code
- move more var at the top of their scope
- rewrite a loop to be more efficient

13 years agoAdd support for setting the cellPadding attribute in IE6/7 327/head
timmywil [Fri, 15 Apr 2011 03:11:49 +0000 (23:11 -0400)]
Add support for setting the cellPadding attribute in IE6/7

13 years agoUpdating the source version to 1.6pre.
jeresig [Thu, 14 Apr 2011 20:29:22 +0000 (16:29 -0400)]
Updating the source version to 1.6pre.

13 years agoTagging the 1.6b1 release. 1.6b1
jeresig [Thu, 14 Apr 2011 20:29:14 +0000 (16:29 -0400)]
Tagging the 1.6b1 release.

13 years agoAdds box-sizing check for IE9 inputs and buttons
timmywil [Thu, 14 Apr 2011 20:26:20 +0000 (16:26 -0400)]
Adds box-sizing check for IE9 inputs and buttons

13 years agoMerge branch '8099' of https://github.com/rwldrn/jquery. Fixes #8099.
jeresig [Thu, 14 Apr 2011 19:57:47 +0000 (15:57 -0400)]
Merge branch '8099' of https://github.com/rwldrn/jquery. Fixes #8099.

Conflicts:
test/data/testsuite.css

13 years agoFix formatting of pull 325. Fixes #4146.
jeresig [Thu, 14 Apr 2011 19:49:15 +0000 (15:49 -0400)]
Fix formatting of pull 325. Fixes #4146.

13 years agoMerge branch 'bug_4146_v2' of https://github.com/jboesch/jquery into jboesch-bug_4146_v2
jeresig [Thu, 14 Apr 2011 19:44:58 +0000 (15:44 -0400)]
Merge branch 'bug_4146_v2' of https://github.com/jboesch/jquery into jboesch-bug_4146_v2

13 years agoreduce function calls
louisremi [Thu, 14 Apr 2011 13:21:08 +0000 (15:21 +0200)]
reduce function calls
simplify easing resolution code
+ some code cleanup

13 years agoMerge branch 'master' of http://github.com/jquery/jquery into effectsCleanup
louisremi [Thu, 14 Apr 2011 09:46:29 +0000 (11:46 +0200)]
Merge branch 'master' of http://github.com/jquery/jquery into effectsCleanup

13 years agoAdjust the unit tests in traversing - is(jQuery) to avoid long-running script alerts
timmywil [Thu, 14 Apr 2011 04:46:10 +0000 (00:46 -0400)]
Adjust the unit tests in traversing - is(jQuery) to avoid long-running script alerts

13 years agofixing bug 4146 - round 2! 325/head
Jordan Boesch [Thu, 14 Apr 2011 04:30:30 +0000 (22:30 -0600)]
fixing bug 4146 - round 2!

13 years agoIE9's support for SVG elements unfortunately does not extend to clearAttributes....
timmywil [Thu, 14 Apr 2011 03:45:58 +0000 (23:45 -0400)]
IE9's support for SVG elements unfortunately does not extend to clearAttributes. Checks for its presence before proceeding.

13 years agoFix test suite fail in IE6/7 on event:undelegate - was failing an if where it shouldn't
timmywil [Thu, 14 Apr 2011 03:10:32 +0000 (23:10 -0400)]
Fix test suite fail in IE6/7 on event:undelegate - was failing an if where it shouldn't

13 years agoMerge branch 'master' of github.com:jquery/jquery
jeresig [Wed, 13 Apr 2011 20:42:20 +0000 (16:42 -0400)]
Merge branch 'master' of github.com:jquery/jquery

13 years agoUpdating Sizzle.
jeresig [Wed, 13 Apr 2011 20:41:55 +0000 (16:41 -0400)]
Updating Sizzle.

13 years agoTicket #8099 Performance tweaking, credits 322/head
rwldrn [Wed, 13 Apr 2011 19:43:15 +0000 (15:43 -0400)]
Ticket #8099 Performance tweaking, credits

13 years agoTicket #8099 Updates per review
rwldrn [Wed, 13 Apr 2011 17:58:17 +0000 (13:58 -0400)]
Ticket #8099 Updates per review

13 years agoTicket #8099 Conditional iframe approache, caches both iframe and iframedoc for reuse
rwldrn [Wed, 13 Apr 2011 17:43:52 +0000 (13:43 -0400)]
Ticket #8099 Conditional iframe approache, caches both iframe and iframedoc for reuse

13 years agoEnsures callback placeholders are tested for and eventually replaced in data only...
jaubourg [Wed, 13 Apr 2011 17:27:19 +0000 (19:27 +0200)]
Ensures callback placeholders are tested for and eventually replaced in data only when contentType is application/x-www-form-urlencoded and data is a string. Removes json to jsonp promotion when jsonp or jsonpCallback options are present. Uses new Deferred.always method to bind cleanUp function.

13 years agoFixes #8635 again (fix was lost in rewrite). Also removes unnecessary "manual" garbag...
jaubourg [Wed, 13 Apr 2011 16:35:38 +0000 (18:35 +0200)]
Fixes #8635 again (fix was lost in rewrite). Also removes unnecessary "manual" garbage collection.

13 years agoMerge branch 'fix_suite_fails' of https://github.com/timmywil/jquery into timmywil...
Dave Methvin [Tue, 12 Apr 2011 23:42:35 +0000 (19:42 -0400)]
Merge branch 'fix_suite_fails' of https://github.com/timmywil/jquery into timmywil-fix_suite_fails

13 years agoMerge branch 'jslint_function_in_loop' of https://github.com/timmywil/jquery into...
Dave Methvin [Tue, 12 Apr 2011 23:39:53 +0000 (19:39 -0400)]
Merge branch 'jslint_function_in_loop' of https://github.com/timmywil/jquery into timmywil-jslint_function_in_loop

13 years agoVML.type test was causing multiple test suite fails, fix attributes.js fail in IE6... 323/head
timmywil [Tue, 12 Apr 2011 23:32:18 +0000 (19:32 -0400)]
VML.type test was causing multiple test suite fails, fix attributes.js fail in IE6 where the val(String/Number) tests were interfering with the val(Function) tests

13 years agoFollowup to #8753. Modify new Event constructor signature to jQuery.event(type, props...
Dave Methvin [Tue, 12 Apr 2011 23:29:09 +0000 (19:29 -0400)]
Followup to #8753. Modify new Event constructor signature to jQuery.event(type, props), which can be exploited by jQuery.event.trigger as well.

13 years agoFixes #8099 using iframe to capture an element's real default display; suggested...
rwldrn [Tue, 12 Apr 2011 21:27:45 +0000 (17:27 -0400)]
Fixes #8099 using iframe to capture an element's real default display; suggested by lrbabe/louisremi

13 years agoMerge branch 'fix-8790-quick-trigger'
Dave Methvin [Tue, 12 Apr 2011 22:46:21 +0000 (18:46 -0400)]
Merge branch 'fix-8790-quick-trigger'

Conflicts:
src/event.js

13 years agoExplicitly set event.type in case we chopped out a namespace or exclusive flag.
Dave Methvin [Tue, 12 Apr 2011 22:32:23 +0000 (18:32 -0400)]
Explicitly set event.type in case we chopped out a namespace or exclusive flag.

13 years agoJSLint failed due to function created within for loop 321/head
timmywil [Tue, 12 Apr 2011 22:30:21 +0000 (18:30 -0400)]
JSLint failed due to function created within for loop

13 years agoUse explicit "new jQuery.Event" to avoid double-function-call overhead.
Dave Methvin [Tue, 12 Apr 2011 21:46:15 +0000 (17:46 -0400)]
Use explicit "new jQuery.Event" to avoid double-function-call overhead.

13 years agoAccessing the 'type' property on VML elements fails on IE. Fixes #7071.
John Firebaugh [Tue, 12 Apr 2011 20:48:22 +0000 (16:48 -0400)]
Accessing the 'type' property on VML elements fails on IE. Fixes #7071.

13 years agoMerge branch 'master' of https://github.com/rjgotten/jquery into rjgotten-master...
John Resig [Tue, 12 Apr 2011 20:39:30 +0000 (16:39 -0400)]
Merge branch 'master' of https://github.com/rjgotten/jquery into rjgotten-master. Also added in unit tests covering the case. Fixes #6180.

Conflicts:
src/manipulation.js

13 years agoMerge branch 'master' of https://github.com/jclain/jquery into jclain-master
John Resig [Tue, 12 Apr 2011 20:26:41 +0000 (16:26 -0400)]
Merge branch 'master' of https://github.com/jclain/jquery into jclain-master

13 years agoMerge branch 'bug_7931' of https://github.com/Xavi-/jquery into Xavi--bug_7931
John Resig [Tue, 12 Apr 2011 20:13:56 +0000 (16:13 -0400)]
Merge branch 'bug_7931' of https://github.com/Xavi-/jquery into Xavi--bug_7931

Conflicts:
src/offset.js

13 years agoMerge branch 'Sub_Naming' of https://github.com/timmywil/jquery into timmywil-Sub_Naming
John Resig [Tue, 12 Apr 2011 20:05:40 +0000 (16:05 -0400)]
Merge branch 'Sub_Naming' of https://github.com/timmywil/jquery into timmywil-Sub_Naming

Conflicts:
src/core.js
src/css.js
src/event.js

13 years agoMore formatting tweaks.
John Resig [Tue, 12 Apr 2011 19:54:30 +0000 (15:54 -0400)]
More formatting tweaks.

13 years agoFixing some minor formatting problems.
John Resig [Tue, 12 Apr 2011 18:58:55 +0000 (14:58 -0400)]
Fixing some minor formatting problems.

13 years agoMerge branch 'fix-8790-quick-trigger' of https://github.com/dmethvin/jquery into...
John Resig [Tue, 12 Apr 2011 18:57:30 +0000 (14:57 -0400)]
Merge branch 'fix-8790-quick-trigger' of https://github.com/dmethvin/jquery into dmethvin-fix-8790-quick-trigger

13 years agoFixes #8099 using iframe to capture an element's real default display; suggested...
rwldrn [Tue, 12 Apr 2011 17:47:27 +0000 (13:47 -0400)]
Fixes #8099 using iframe to capture an element's real default display; suggested by lrbabe/louisremi

13 years agoTicket 8099, Reattempt with iframe
rwldrn [Tue, 12 Apr 2011 15:48:07 +0000 (11:48 -0400)]
Ticket 8099, Reattempt with iframe

13 years agorevert last commit 319/head
louisremi [Tue, 12 Apr 2011 11:12:58 +0000 (13:12 +0200)]
revert last commit

13 years agoswitch double quotes with single quotes
louisremi [Tue, 12 Apr 2011 11:07:38 +0000 (13:07 +0200)]
switch double quotes with single quotes

13 years agoresolve more conflicts
louisremi [Tue, 12 Apr 2011 09:39:21 +0000 (11:39 +0200)]
resolve more conflicts