labofsahil/github-event-dataset-2012 huggingface dataset:
Revert "add AR deep dive video links to guides"

This reverts commit 25648ce35b9d8df9fac81c1d53c45aaeef08fde9.
Revert "Switch to 1.9 hash syntax"

This reverts commit d8596c4b8500a899d686c57fa093c549b0378c7a.

Reason: too many mistakes [ci skip]
remove kindle link from guides index [ci skip]
copy edits and fixes [ci skip]
modify supplies index.jsp
backend implementation stuff
Use ColorIterator.
engine: load dvd uris
ui: no on-screen controls with hide flag
snappy: add media-info flags to print media tags
snappy: blind option runs snappy without ui
snappy: small style fixes
Changed sectorId to Integer.
[x11-misc/mate-notification-daemon] fix dbus service installation
[mate-base/mate-applets] first attempt to support different libexecdir, to avoid GNOME collisions
[mate-base/mate-panel] drop ./autogen.sh usage, fix GNOME collisions
[mate-base/mate-panel] fix dependencies and do not pollute environment
[mate-base/mate-applets] fix dependencies and libexec directory
[mate-base/mate-applets] fix typo
[mate-base/mate-applets][mate-base/mate-panel] giv up on get_* and just use direct libexec
[app-text/mate-doc-utils] versioning
[mate-base/mate-corba] versioning
[mate-base/mate-conf] versioning
[mate-base/libmatecomponent] versioning
[mate-base/mate-mime-data] versioning
[mate-base/libmate] versioning and fix a dep
[mate-base/libmatecomponentui] versioning and multiple fixes
[mate-base/libmatecomponentui] inherit mate, not gnome2
[mate-base/libmatekeyring] versioning
[mate-base/mate-keyring] versioning
[mate-base/libmateui] versioning
[mate-base/libmatekbd] versioning
[dev-libs/libmateweather] versioning
Merge pull request #28 from lycus/master

Fix build with -property.
delete some un-use file and fix readme
Setup project skeleton

Added files which form the bases of the project
Add gitignore

ignore pyc files
Fix conf sample

Edit conf file into OpenStack ini convension
API clean up

Fix api executable to utilize Nova code.
Add api unittest

test script for dough api
Add dough api

Dough api script
Add Dough DB api

Dough DB module skeleton code
Fix gitignore

Ignore swp, venv, egg-info
Add dough sqlalchemy moodel

sqlalchemy model skeleton
Add dough billing package

Dough billing package skeleton
suunnitteludokumentti
Fixed bad index.rst
Updated failing SorinLordOfInnistradTest (ability text seems has been changed)
@updateURL for Scriptish
adding .sass-cache/ and public/assets to gitignore
modified the term to store session information.
preambule
une classe pour representer les competences
une classe pour representer les competences
fix
Use RET to move current line down
AC in conf-colon-mode
Create helper method that send signal to guard
Send message as an json array
fix router to handle params
we now have a page we can screenshot
Replace ruby's fileutils cp_r with a symbolic-link-friendly platform-

This only has been tested on macosx, so far.
Debian Linux build and debug
python bindings : expose largest_bbox_only property
+ add optional smothing to line_symbolizer
  ( TODO: conv_dash )
+ support smoothing in conv_dash
+ re-use cairo_context
remove now unused blending modes as they have been replaced with AGG compositing modes - refs #1206
Revert "first commit"

This reverts commit 72aeb15d107ee82ade6bcc797acc3ef65b7c3fa5.
travis: install apc & memcached
Update config/site/tile_sources.xml

Added two overlay maps:
public transport map openptmap.org and
fire hydrants map openfiremap.org
とりあえず次に行く
リリースの方針
Password forget Controller rebuild
Merge remote-tracking branch 'origin/story/028' into story/028
Update redcarpet support to version 2
Update pygments.rb version
Only pass first class to Pygments

This prevents an exception if something like the following is used:

~~~ {foo bar}
some code
~~~
remove whitespace errors
Integrate pull request #619 from mojombo/jekyll
Import morphs.
Change reference to baserock with maui for morphs.

Use this repository instead of Baserock's.
Use the github alias for our repositories.

Let's use the github alias for our repositories instead of defining
a new maui alias.
add an empty buffer unit test
use more portable fcntl method for FD_CLOEXEC bit, enable it on forgotten sockets
local client forks in destructor so that the kak server detaches from terminal
Merge pull request #52 from mazgi/pull_request/plugin_tail_line_break_fix

Has changed the "remove \n" method (rstrip! -> chomp!).
implement simple weighted round robin
rewrote in_tail's 'weight' option
v0.10.25
圧縮／暗号化処理を組み込み(未検証)
.bundleとvendorを除外
暗号化時に毎回saltを生成し直すよう修正
message optionのフォーマットを変更
ホスト名を使用したtag変換に対応
暗号化／複合化モジュール廃止
配列のインデックス誤りを修正
add out_forward test
Chib analysis.
added screen class
added character, symbol
finished implementing features from 2nd part of tutorial
NEXUS-5043: decode the path

This problem was never hit as "non standard" characters are rarely used
in GAV coordinates, and before, even if they were used, Maven2 by default
used lightweight wagon that does not encoded paths.

Today, Maven3 defaults to wagon-http that uses Apache HttpClient that does
encode paths if a "prohibited" character is used.
Use SecurityConfigurationManager instead of peeking into SecurityConfigurationSource directly, as the config manager caches the model instance and provides locking - otherwise we end up with two instances of the SecurityConfiguration model (one cached in SecurityConfigurationManager and one cached in FileSecurityConfigurationSource). Other possible solutions - call SecurityConfigurationManager.clearCache() after peeking into SecurityConfigurationSource (messy) - or call SecurityConfigurationSource.getConfiguration() first and only if it's null then call SecurityConfigurationSource.loadConfiguration().
NXCM-3970: Bugfix.

The goal was not working when the Mojo was not configured in the
POM (the "do not modify POM" case).
[NXCM-4004] Redirect to license request page in case that there is no license installed or an expired trial license

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
o setup optional 'enter-license' resource
o fix NexusApplication to use customizers

Conflicts:
	nexus/pom.xml: some version conflicts, jetty+restlet-bridge
o remove redirect to optional licensing resource
o '/' should permanently redirect to index.html
[NXCM-4170] Avoid deadlocks by eagerly initializing temp/config directories

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
o fix typo in version (restlet-bridge 1.21 doesn't exist yet)
[NXCM-4170] Avoid useless nullification of config/temp dir

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
[NEXUS-5026] Generate a jira stub specific port (to avoid misuse of web proxy port)

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
[NEXUS-5026] Use the new jura-server-port for Jira stub

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
[NEXUS-5026] Add IT for problem reporting when using a global web proxy

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
NXCM-3923: Extending DTO with new field.
Merge branch 'refs/heads/master' into nxcm-4170-fix-deadlock
Merge pull request #419 from sonatype/nxcm-4295-port-2.0.x

o [NXCM-4296] Port Nexus 2.0.5 changes to master
Merge pull request #405 from sonatype/use-security-config-manager

Use SecurityConfigurationManager instead of peeking into SecurityConfigurationSource directly
Merge pull request #414 from sonatype/nxcm-3970-deploy-staged-goal-fix

NXCM-3970: Bugfix.
Security config changes.

While Nexus boots, Security was not loading configuration
as it was "lazy". Instead, the "upgrade" event inspector
was loading it eagerly, the one meant to perform upgrade.

So, a bit clean up, now security is pinged during nexus
boot (to force it config load), and upgrader inspector
made to kick in only when needed, not resulting in
flush/reload _always_, as it is not needed unless
upgrade happened.
...Is this really that simple? Method definitions return numSides & name, or set them to parameters passed in (not required here really, but…)
When coverage is disabled ignore affected instructions
dvdplayer: fixed bluray playback from directly from passed iso/img file

This was broken since 25eea81654add5a5d3394ae46b1ecd0edb1313b4
Merge remote-tracking branch 'origin/master' into android-tegra2-external
FIX: regenerate auto-thumb if not present
mysql: don't remove "BEGIN" and "END" from CREATE TRIGGER queries (thanks koying)
videodb: add triggers on deletion of movies/tvshows/musicvideos to delete any related records in the taglinks table (fixes #13544)
jsonrpc: remove unsupported PVR channel related properties from "List.Item.File"
Merge pull request #1776 from Montellese/fix_13544

videodb: remove tag/taglinks connections when removing items
media library: don't append empty "filter" option to all folder paths after 26acb13d2ec
autotools: fix build hitting wrong config header (ticket #13364)
[egl] fixed, remember vsync setting and restore it when changing display resolutions
Merge pull request #1753 from koying/fixmissinggenthumb

FIX: regenerate auto-thumb if not present
Merge pull request #1814 from elbeardmorez/master

autotools build fix
Merge remote-tracking branch 'origin/master' into android-neon
Updated version - forgot to add minified to 1.0.1
Improve nextTick test
Add video model and base request and mapping functionality
Video mapping
correzione di alcune parole. correzione fatta da Mewtwo
add url unquoting, and use git blob streams to be more effecient
Simplify density discretization

Three states instead of two. The current transitions simulate a
Schelling segregation.
Update ECCS slideshow
Numerous obstacles can be considered
Add a falloff distance to the obstacles so that they repel land lots
from afar
* Fix voor zwarte profile pics (meer facebook-profile urls parsen)
Handlebars: allow getters/helpers in args, fix hashes
update docs
Allowing passing in a default DDP endpoint as an environment variable.
Add package to make app redirect to https.
Fix DomUtils.htmlToFragment with SELECTs. Add helpers.

When a <SELECT> was rendered on IE9 (or older) via DomUtils.htmlToFragment, the
hack we used somehow failed to properly set some attributes; they would show up
in innerHTML but not affect property values. eg, SELECTED would show up in an
OPTION's innerHTML but option.selected would not be set (nor would the parent
SELECT's value or selectedIndex). Fix this by replacing a mergeAttributes call
with an explicit attribute copying loop.

Also, add the helpers setElementValue and getElementValue to DomUtils, which are
used both in the test of this fix and will be used in a future change.

Fixes #496.
When preserving elements with values, preserve the value of elements unless the
server's rendering has changed.

This fixes two independent issues:

  - If the user has changed the value in a preserved field, and something causes
    the field to be rerendered, and the re-rendering renders the same value that
    was originally rendered, this now preserves the user's change rather than
    reverting to the original value.

  - INPUTs with type other than TEXT can now have reactive values (eg,
    type=SUBMIT).
Preserve CHECKED status similarly to VALUE.

Fixes #510.
Make minimongo tests pass in old browsers (FF3.6, IE8).

(Broken test added in 129154695455282a.)
Make minimongo test parse on IE7 unminified.
Add d3 to license file. We're distributing it with our example source code.
Move "resume" login tokens from a separate collection into the user doc.

Observable changes:

 - tokens can no longer be used to log in as a user which no longer exists

 - when you log in with a "reset password" link, all logins in other browsers
   lose the ability to reconnect. However, other browser logins are not
   immediately disconnected, and "change password" does not invalidate any
   tokens.
make methods out of lexeme.next()/prev()
got rid of index 2 canvas and added res
resume added
trying to get photo working, giving up on draggable
#11 Change success message
added new file
Moo
Moa
Moo
Moaadoo
yo
Added tests for Cow
Added more Cow tests
Borro todo para empezar de nuevoL
fixing readme and ignore list
fixing readme and ignore list
fix revert, add flush of UnitOfWork
Fix cards pager behaviour after screen rotation.

After rotation activity is recreated and calls population of pager via
async task loader. Visible page becomes invisible (empty) some strange
way, left-right swipe works fine and shows correct pages. Setting pager
adapter fixes the problem.

Probably a cause of the problem is in pager adapter which saves current
page index for himself and restores it after rotation, but it hasn’t
cards anymore (because they are loading via async task loader). The
thing is that card fragment HAS card object after rotation. This is a
really strange thing, probably issue:
http://code.google.com/p/android/issues/detail?id=19211
Compression, a bit of renaming, fixing/renaming in serverthread, no new features(except slooow mouth animation (=disabled))#
今度こそ。MacOS の管理ファイルは環境依存のためバージョン管理を行わない。
Minor modifications to `lib/read.js`
Take mail conf from mail host
Some generally sane defaults and use mail conf
modules refresh
adds markdown cleanup for description and some literal changes
Remove AdColony from the SDK proper.
Fix for shader warning on windows ( #296 )
adds positive tested implementation of asma. adapts templates and test code.
adds tested version of asmb. adds a Makefile to asmb and a test script skeleton.
SERVER-7637 Make jstests/drop2.js use stardard log verbosity again
Check authorization in the new AuthorizationManager SERVER-7572
SERVER-7484 zero results should not trigger error w/ returnPartial
mongoimport more help text
Merge branch 'master' of github.com:mongodb/mongo
Don't query the admin database when using getlasterror as it causes issues in authenticated environments
Update changelog
Started working on a rebuild of api request related events
Show loading indicator when log messages is requested
Added well2 as container to form for creating label
Set boolean for activation and deactivation of streaming mode
Merge remote branch 'origin/master' into streaming
Adding functionality for refresh notice
Add class for highlighting new entries. Also added some explanatory inline documentation.
Prevent filter form from being submitted
Merge pull request #28 from monlog/streaming

Streaming mode implemented
bugfix. update on dict doesn't return value
Added listeners for the menu tree's leafs and implemented basic listeners in a new League controller.
MWQueryBuilder moved to Kernel folder.
MWQueryBuilder movement side-effects.
Wholething commented - Kernel folder.
blkid
merge blkid
unintetionally removed README-file
Update servo to rust 3b6f5a1. Removes extraneous by-ref parameter to option::get(), and removes binary move operator.
fix the configuration examples for cinch-identify plugin
quit on CTRL-C
1.1.1
Greek translation: improvements.
FLAC Source: Basic support for embedded metadata.
MpaDecFilter: cleaning
Bugfix: Do not raise exception on loading failure (nwcsaf_pps)
Compiles as a lib with stub Kobra example
Zap bum method
Adding nodetype and move New funcs back
fastcgi: removing dependency on unix-only.
prettyprint: document "~1 more~" behavior (funny because it takes as much as room as... 1 more).
debugger: fix error summary for not-found-in-roots.
benchmark.busy-loop: adding a busy-loop "control" benchmark.
Adding tweepy api reference.
Improved the Foursquare lib
Commit 9 TST-1 Thu Nov  8 13:43:20 CET 2012
Commit 12 TST-1 Thu Nov  8 14:12:34 CET 2012
Commit 15 TST-1 Thu Nov  8 14:28:25 CET 2012
trans : conduct (partly translated)
Merge branch 'master' of github.com:mtlpy/pyconca
More work on deconvolution
merging versions
merging versions
merging versions
merging versions
remove dependency on PSCX module and use a script fron the Technet samples site for XSD validation
wine --devl 1.5.5

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
mapnik: fix compile error with system Python

Mapnik by default tries to install to the site-packages in /System
when brewed against system Python.  This causes a build error
because that directory is not writeable.  Mapnik correctly
determines the versioned site-packages name without modification,
but for Homebrew it needs the proper prefix.

* Add the standard `which_python` function to the formula.
* Add a scons argument for `PYTHON_PREFIX`
* Add the standard caveat for `PYTHONPATH`.

Discussed upstream: https://github.com/mapnik/mapnik/issues/1155
and tested on Lion against the system Python.

Fixes #11389

Closes #11407.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
writerperfect 0.8.1

Closes #13719.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
lighttpd 1.4.31

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
node 0.8.15

Closes #16315.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
zint: update homepage

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
bsdmake is *not* provided by Xcode/CLT

Fixes #14626.

Also make proctools install do prefixes other than /usr/local.
fon-flash-cli 1.5.6

Closes #14561.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
snobol4 1.4.1

Upgrade snobol4 to version 1.4.1 and add `--mandir`.
Tested on Lion using llvm and clang from XCode-4.3.3.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
autojump 21.0.5

Closes #16196.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
fixed registration and login form css
stlye fixes for user profile
Apparently I don't understand ElasticTestCase.
Game model: refactored attacked method, iImplemented defense method.
split mina client
add system, state and stateManager
Improve the kinect for windows grabber with high resolution mode and multiple sensor support.
Fixed bug that failed to remove a component that was about to be replaced. Entity was trying to call a non-existent removeComponent function.
monadic random thingy builds
turned on warnings and eliminated some redundancies
- Conflict finder
Merge branch 'master' of git@github.com:ndejay/mrenci.git

Conflicts:
	R/pipeline_scratchboard.R
Refactor to make exercises more modular.
changed default color for our node to be white instead of salmon2
Updated when wolves choose new prey
Began the combat system, including with Wolf
Made attack messages broadcast
Removed default key to make sure users input their own.
added key param to doc
Merge branch '1.0'
vim: also actvating vim-addon-manager for updates
Mac OptimizeEnvironment AppleScript and more

* to be used with Control Plane: http://www.controlplaneapp.com/
* Improved install script to handle spaces robustly and accept different source
changes to prtDataInterfaceCategoricalTargets.m, retainClasses now enables
ds.retainClasses('Class 0')
Merge branch 'master' of github.com:newfolder/PRT
Tic Tac Toe in scala, for two players
Added missing package to packages section.
Add options for vimclojure
Add settings for vimclojure
analytics: add tests for tag SQL dao

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
util: make catalog translation files path configurable

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
move header to bottom
unlink instrument volume from global
Missing CSS.
Merge branch 'master' of github.com:nmalkin/ircel
query now playing info from riddim over network:
Add info about preset_locale filter
Update README.md

Add one-step install part.
irciii -> ircv in manifest.
Update json-xargs
Update Utils
Update json-wrap
Copy-pasted pretty stolen icons, adapted app for iPhone 4.3+
keep updating delete button CSS!
Print error code on unsuccessful compilation
chapter 3 finished ,however computing need to be polished.
shipping ready.
enriched documents; but doesn't generated?
multiline option (set :m) does not work in doctest mode.
travis test enabled for cma-es.
Define asprintf() for systems whose libc lack the function.
Fixes an error (due to copy/paste)
Updated list of contributors :)
Ticket #148 : small updates to the README
Merge branch 'master' of https://github.com/obiot/melonJS
fix bandwidth IP display in client bridge mode
bump to latest attitude adjustment revision
Merge remote-tracking branch 'obsy/master'
adding catchall and supporting quickSchedule and stopFinder
Specified deployment user home directory
Sort order changed to 'purchased' date
New Worksheet mixing scheme
fixed a multitude of things: Players may now have negative rep, console can set rep of player, added asynchronous transfer to database, added config to turn asynchronous database transfer off, added DS support
added by Juan in FPO graphic
Call function to toggle bookmarket.
Verdict on OCSP freshness.
Added full (colored) OCSP status report info.
Added the amount of certificates in the OCSP Response
bin directory is not monitored in git
A tester file for argparse and command line options.
Use argparse to handle CLI.
Made CLI executable.
Cleaned up, a la Lint.
Fix for SSL settings
OS X installer updates for PostGIS 2
[SUITE-1188] mvn command to create sample Process Java project is wrong
Fix permissions on image-builder.
Updated cucumber tests to register user for origin
Merge pull request #172 from fotioslindiakos/origin_cucumber

Updated cucumber tests to register user for origin
Add simple performance test for bulk inserts.
register forms now require email confirmation, but not password confirmation
sqlalchemy.exceptions has been renamed sqlalchemy.exc ages ago.
Redo play wip
re-did play logic to have key model trigger play on itself rather than instrument model doing it, and instrument model call playKey when socket emits keypressed, to prevent infinite socket loop
Successfully pass key pressed between different browsers :)  fixed by not passing key {key : key} to socket
Merge branch 'redoPlayLogic'
Revert "Installed compass"

This reverts commit 48a0f6d0e7d732f5707a4fd6371c1ea6517c6e80.
adding horde libraries to mail/3rdparty
fix namespace issue in calendar export
Bookmark: Load more tags for the autocomplete
Current user as a default username
Kube texture
modified:   index.html
	new file:   lib/jquery.mobile.subpage.js
	new file:   resources/style.css
remove leftovers and comments
remove extre js call
Fix test for succesful aptitude package removal

The shell script to test the removal was incorrect. Fixes #127
Updated user form to make sign up accomodations
Deleted Home controller and associated views
- path wildcards working
- tests to check order is applied correctly
[GH #886] Remove concurrent say in t/pmc/task.t

Even busy sleeping did not help on some systems, so remove the problematic line.
It still tests if the task it properly killed, but we cannot guarantee when it is killed.
skip outdated extend tests with old embed API [GH #829]

I also tried to convert extend_15 to the new API but failed to understand Parrot_runcode()
Chromium should use TCMalloc on Mac to go fast
https://bugs.webkit.org/show_bug.cgi?id=102866

Reviewed by Eric Seidel.

This patch enables TCMalloc for some WebKit objects. It improves
dom-modify on Mac by 5-10%.

On non-Mac platforms, Chromium already uses TCMalloc throughout the
project. Unfortunately, we haven't yet figured out how to turn TCMalloc
on globally on Mac because the approach we use for other platforms makes
some OS X APIs sad.

The next best thing would be to enable TCMalloc for WebKit by
overriding the global new and delete operator, as is done on apple-mac
and other platforms. Unfortunately, we cannot use that approach either
because the Chromium WebKit API is not memory tight.

Fortunately, WebKit has a mechanism for selectively enabling TCMalloc
for a selection of objects by overriding the new and delete operators
on those objects. This patch opts chromium-mac into that scheme by
setting the appropriate preprocessor macros.

* WTF.gyp/WTF.gyp:
* wtf/Platform.h:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@135666 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Log to console when autofocus is blocked by sandbox attribute.
https://bugs.webkit.org/show_bug.cgi?id=103255

Reviewed by Ojan Vafai.

Source/WebCore:

Adding a short log message when autofocus is blocked by a document's
sandbox flags, as it's currently a black box.

Test: fast/forms/autofocus-in-sandbox-without-allow-scripts.html

* html/HTMLFormControlElement.cpp:
(WebCore::shouldAutofocus):

LayoutTests:

* fast/forms/autofocus-in-sandbox-without-allow-scripts-expected.txt: Added.
* fast/forms/autofocus-in-sandbox-without-allow-scripts.html: Added.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@135903 268f45cc-cd09-0410-ab3c-d52691b4dbfc
IndexedDB: Remove IDBDatabase.setVersion API
https://bugs.webkit.org/show_bug.cgi?id=94972

Reviewed by Tony Chang.

Source/WebCore:

This has been out of the spec for over a year. No other browser has
implemented it for close to a year.

Tests - removed.html

* Modules/indexeddb/IDBCallbacks.h:
(IDBCallbacks):
* Modules/indexeddb/IDBDatabase.cpp:
(WebCore::IDBDatabase::IDBDatabase):
* Modules/indexeddb/IDBDatabase.h:
(IDBDatabase):
* Modules/indexeddb/IDBDatabase.idl:
* Modules/indexeddb/IDBDatabaseBackendImpl.cpp:
(WebCore::IDBDatabaseBackendImpl::processPendingCalls):
* Modules/indexeddb/IDBDatabaseBackendImpl.h:
(IDBDatabaseBackendImpl):
* Modules/indexeddb/IDBDatabaseBackendInterface.h:
(IDBDatabaseBackendInterface):
* Modules/indexeddb/IDBRequest.cpp:
* Modules/indexeddb/IDBRequest.h:

Source/WebKit/chromium:

* src/IDBCallbacksProxy.cpp:
* src/IDBCallbacksProxy.h:
(IDBCallbacksProxy):
* src/IDBDatabaseBackendProxy.cpp:
* src/IDBDatabaseBackendProxy.h:
(IDBDatabaseBackendProxy):
* src/WebIDBCallbacksImpl.cpp:
* src/WebIDBCallbacksImpl.h:
(WebIDBCallbacksImpl):
* src/WebIDBDatabaseImpl.cpp:
* src/WebIDBDatabaseImpl.h:
(WebIDBDatabaseImpl):

LayoutTests:

* storage/indexeddb/removed-expected.txt:
* storage/indexeddb/resources/removed.js:
(test):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@135904 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Unreviewed GTK gardening, adding image baseline for
fast/images/paletted-png-with-color-profile.html.

* platform/gtk/TestExpectations:
* platform/gtk/fast/images/paletted-png-with-color-profile-expected.png: Added.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@123244 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Add /usr/bin to PATH so PrettyPatch can find git.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@123245 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Unreviewed GTK gardening, adding platform-specific baseline for
fast/dom/Window/window-properties-performance.html that assumes jsHeapSizeLimit
attribute to be undefined, as expected for ports using JavaScriptCore.

* platform/gtk/TestExpectations:
* platform/gtk/fast/dom/Window/window-properties-performance-expected.txt: Added.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@123246 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Move pointer lock test resources to http/tests/resources in preparation for adding new tests to http.
https://bugs.webkit.org/show_bug.cgi?id=91882

Reviewed by Adrienne Walker.

* http/tests/resources/pointer-lock/pointer-lock-test-harness.js: Renamed from LayoutTests/pointer-lock/resources/pointer-lock-test-harness.js.
* pointer-lock/bug90391-move-then-window-open-crash.html:
* pointer-lock/lock-already-locked.html:
* pointer-lock/lock-element-not-in-dom.html:
* pointer-lock/lock-fail-responses.html:
* pointer-lock/locked-element-iframe-removed-from-dom.html:
* pointer-lock/locked-element-removed-from-dom.html:
* pointer-lock/mouse-event-api.html:
* pointer-lock/mouse-event-delivery.html:
* pointer-lock/pointer-lock-api.html:
* pointer-lock/pointerlockchange-pointerlockerror-events.html:
* pointer-lock/pointerlocklost-event.html:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@123247 268f45cc-cd09-0410-ab3c-d52691b4dbfc
add SK_DISABLE_DITHER_32BIT_GRADIENT define, in preparation for rebaselining
https://bugs.webkit.org/show_bug.cgi?id=103269

Reviewed by NOBODY. Unreviewed.

No behavior change, as this define already exists on the chrome side in SkUserConfig.h

* skia_webkit.gyp:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@135735 268f45cc-cd09-0410-ab3c-d52691b4dbfc
[BlackBerry] FCC doesn't work in textarea
https://bugs.webkit.org/show_bug.cgi?id=102088

Reviewed by Antonio Gomes.

Remove the cancel button specializations, it was needed at some point but hitting it
works just as well without it. This unbreaks FCC in textarea's.

* WebKitSupport/FatFingers.cpp:
(BlackBerry::WebKit::FatFingers::isElementClickable):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@134980 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Ajout de parametre pour paybox dans la config
history for shell is fixed
Rotation to Angles
Bugfix: missing "eq _eq_name_" after bridge node
Delete invalid TGT cookies
Handle login attempt (LoginCredentialAcceptor)
Add an error message to the `invalid_*` methods
Updated CASinoCore
Merge new features from polymorphable
[maven-release-plugin] prepare release base-1.0.2
starting mocking...so exciting!!
mock renames funcion and invokes mock script
mock works with any command (not just functions) and the parameter filters are implemented. also implemented Clear-Mock
added some lost tests i accidentally cut and added param passing
mocking complete.
inline help docs added, some small formatting improvements needed for examples
make sure filter is a boolean
fix tests
fix clear-mocks by explicitly clearing hashtable
adding new Assert-MockCalled feature: exciting stuff!
finished assert-mockcalled i think
a few small fixes to mocking
add documentation for Assert-MockCalled
adding documentation to commands.
adding more comment docs and fixed a ps2.0 bug
added almost all comment help for exportd funtions
more help docs
completing should doc
add doc for the TestDrive
adding a pester help topic
midway thru readme
pruned more smileys
Create a test that sets up the demo custom fields
Support json::merge

issue #33
Update document for merge
Change json_bad_cast parameter from void to json

fixes for https://github.com/takei-yuya/pficommon/commit/34cb158b6ed9dd34038ba171fe772b9c8782d573#commitcomment-1186910
Fix test for merge

fixes for https://github.com/takei-yuya/pficommon/commit/34cb158b6ed9dd34038ba171fe772b9c8782d573#commitcomment-1186917
merge_with: use external function to merge conflict value

fixes for pull request #36
https://github.com/pfi/pficommon/pull/36#issuecomment-5063326
Merge pull request #36 from takei-yuya/merge

Support json::merge
implemented setBinaryStream by Johann Oskarsson
separate client and server, use publish/subscribe
Fix authHandler()
Add rest_jsns
All framework changes incorporated
Updates Zsh and Vim
Initialise the 'jobs' config file setting with the current number of CPU cores.

Fixes #982. Additionally, running 'install -j' without the numerical argument
will have the same effect at runtime.

Side effect: 'install -jNUM' doesn't work when there's a space between -j and
NUM.
Make 'viewAsFieldDescr' a total function.

Fixes #980 by allowing to create config fields from options with optional
arguments. Without this change, setting the 'jobs' or 'verbose' fields in the
config file results in a fatal error on startup.
Merge branch 'cabal-1.16' of git://github.com/haskell/cabal

Conflicts:
	cabal-install/Distribution/Client/Install.hs
removed addressable dependency and replaced with custom implementation
Demo updates to include mysql related precision migrations.
Do not let short disablements of the gc affect the gc intervals.

The gc interval is now properly saved and restored. Before this, brief
gc disablements could lead to alloc_threshold being set to the
minimum, which then could lower the max threshold calculation so that
the next gc interval could be unnaturally short through the
GARBAGE_MAX_INTERVAL strategy.
Added a few more cases for checking int formatters.

These can potentially format native ints with different code paths.
CEDAR_REPORT_FAILURES_IMMEDIATELY

Added CEDAR_REPORT_FAILURES_IMMEDIATELY env
variable to immediately print out failures.
Merge pull request #50 from onsi/fail_fast

Add immediate failure reporting to cedar's default reporter
Add hints for ubuntu
taki tam Płatek
- rebuild for kernel-3.5.4-1
- release 12 (by relup.sh)
- rebuild with fixed rpm macros
- release 6 (by relup.sh)
Merge pull request #78 from pmdeazeta/improvement

[opnestack|identity] Added set_tenant request for identity service
Implemented basic battle system

External stuff needed still:
Enemy classes
Trophies(not necessary for the build)
Life decrementing(checking for death as well)
Proper condition to initiate battle

I'll be working on these a bit later
Tweaking date and datetime types
Protect LandlordsController from mass-assignment
Protect TenantsController from mass-assignment
Remove un-needed require.
Fix non-uniformity by using a retry algorithm.

Signed-off-by: Philip Puryear <philippuryear@gmail.com>
Add a short comment explaining the bit magic in read_mpz.

Signed-off-by: Philip Puryear <philippuryear@gmail.com>
Bump simple-strconv.

Signed-off-by: Philip Puryear <philippuryear@gmail.com>
for jerith
sweet image of a robot added
Merge branch 'master' of http://github.com/purederp/robo
Style and script are abstracted to separated files.
favicon added.
Foreman integration, to simplify running the server.
TST: unit test, close #1680
BUG: move utf8 recoding elsewhere, add test case to deal with #2298
BUG: PeriodIndex tries to take frequency from first element. GH #1118
API: deprecate broadcasting TimeSeries across datetime indexed DataFrame index by default #2304
Added clarifying words on the actual online content of pyjs.org
first version of shart
Fix tags format bug
добавлен конфиг для DEvstage
удален яндекс сертификат
getter methods for frames, samplerate and channels (Superclass)
Updated migrations, seeds, added header and added open dialog
Changed some of likes index code so that it displays 4
web - add minitube
pc - dont export PKG_CONFIG_PREFIX

With PKG_CONFIG_PREFIX exported configure fails like this:

g++ /home/radek/qte/qtmoko/config.tests/dbus/main.cpp
g++ -MMD -MF /home/radek/qte/build-pc/config.tests/dbus/.obj/main.cpp.d -c -pipe -I/usr/lib/x86_64-linux-gnu/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -fno-rtti -fno-exceptions -w -O2 -D_FORTIFY_SOURCE=0 -D_FORTIFY_SOURCE=0 -DDBUS_API_SUBJECT_TO_CHANGE -DQT_NO_DYNAMIC_CAST -I/home/radek/qte/build-pc/sdk/devices/home/radek/qte/qtmoko/devices/pc/mkspecs/qws/linux-native-g++ -I/home/radek/qte/build-pc/config.tests/devices/home/radek/qte/qtmoko/devices/pc/mkspecs/qws/linux-native-g++ -I/home/radek/qte/qtmoko/devices/pc/mkspecs/qws/linux-native-g++ -I/home/radek/qte/build-pc/config.tests/dbus -I/home/radek/qte/qtmoko/config.tests/dbus -I/home/radek/qte/qtmoko/dbus -I/home/radek/qte/build-pc/dbus -o /home/radek/qte/build-pc/config.tests/dbus/.obj/main.o /home/radek/qte/qtmoko/config.tests/dbus/main.cpp
/home/radek/qte/qtmoko/config.tests/dbus/main.cpp:1:23: fatal error: dbus/dbus.h: No such file or directory
compilation terminated.
*** Error
/dbus/default: Prerequisite failed
/dbus/target: Prerequisite failed
/dbus/target_post: Prerequisite failed
/dbus/cpp_compiler_target: Prerequisite failed
/dbus/main.o: Command execution failed
$$MKSPEC.CXX -MMD -MF $$[OUTPUT.1] -c $${COMPILER.CXXFLAGS} $${COMPILER.DEFINES} $${COMPILER.INCLUDEPATH} -o $$[OUTPUT.0] $$[INPUT.0]
g++ -MMD -MF /home/radek/qte/build-pc/config.tests/dbus/.obj/main.cpp.d -c -pipe -I/usr/lib/x86_64-linux-gnu/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -fno-rtti -fno-exceptions -w -O2 -D_FORTIFY_SOURCE=0 -D_FORTIFY_SOURCE=0 -DDBUS_API_SUBJECT_TO_CHANGE -DQT_NO_DYNAMIC_CAST -I/home/radek/qte/build-pc/sdk/devices/home/radek/qte/qtmoko/devices/pc/mkspecs/qws/linux-native-g++ -I/home/radek/qte/build-pc/config.tests/devices/home/radek/qte/qtmoko/devices/pc/mkspecs/qws/linux-native-g++ -I/home/radek/qte/qtmoko/devices/pc/mkspecs/qws/linux-native-g++ -I/home/radek/qte/build-pc/config.tests/dbus -I/home/radek/qte/qtmoko/config.tests/dbus -I/home/radek/qte/qtmoko/dbus -I/home/radek/qte/build-pc/dbus -o /home/radek/qte/build-pc/config.tests/dbus/.obj/main.o /home/radek/qte/qtmoko/config.tests/dbus/main.cpp
/home/radek/qte/qtmoko/config.tests/dbus/main.cpp:1:23: fatal error: dbus/dbus.h: No such file or directory
compilation terminated.

runwithvars.sh exited with value 1 at /home/radek/qte/qtmoko/src/build/bin/configure line 3966
	eval {...} called at /home/radek/qte/qtmoko/src/build/bin/configure line 3938
	main::configtest('dbus', 'env', 'DBUS_CFLAGS="-I/usr/lib/x86_64-linux-gnu/include/dbus-1.0 -I/...') called at /home/radek/qte/qtmoko/src/build/bin/configure line 4541
	main::test_dbus() called at /home/radek/qte/qtmoko/src/build/bin/configure line 3044
FAIL
DBUS is disabled.
ERROR: You requested "-dbus" but it was disabled.
make: *** [src/build/mkconf/configure] Error 2
rewrote getting started
sending the number of rules of a CSS
Design issue fixed in Content Search page
[FIX] UI - Custom Selec integrated
Merge branch 'master' of https://github.com/rajeshv/pecaa
Give :v on slices the expected semantics.
import according to arglist

does not break anything, but does not seem to get arglists working either
four more passing test files (is this Christmas? :-)
the wingboard is done (and first prototype batch ordered from Seeedstudio), also other clarifications
bumping release so I can push a new gem
adjust drawing on frames
reduce circles
Added some retry logic to the downlod helper, credited @laserlemon, bumped version
List available populations
Added snow's sp_GetStaticBuildings
Added support for a Wishbone UART module.
Ignore SIGPIPE, as needed by the DPI modules which use sockets.
Several other improvements.
Added OpenCores UART. Small changes to prevent some of the Verilator warnings.
Added to the repository.
Git repositories for the DPI modules moved to the git group.
Fix small syntax error.
Added to the repository for the first time.
Added to the repository, they're just a copy from the MinSoC tools.
I used to build them from the MinSoC Repository, but after
several downtimes with OpenCores' Subversion server, I decided to make a copy
and store them in orbuild's repository.
Comments.
Added parameter ENABLE_INSTRUCTION_ROR.
Added parameter ENABLE_INSTRUCTION_CMOV.
ENABLE_GPR_ACCESS_OVER_SPR
Potential bug with the handling of next_sr removed.
Added path to UART module.
Added to the repository.
Added libusb-dev and libftdi-dev to the dependencies.
Added "GDB to JTAG Bridge".
CLANG should be built with --with-default-sysroot instead of --with-sysroot=
Some code factored out to RangeExceptionHandler.inc
delete-trailing-whitespace
Falsche Pfade korrigiert
work on snippet panel
Handle UTF8-encoded filenames. A file called '_content/forløb.xml' is listed (by git) as
'"_content/forl\303\270b.xml"'. In handle_file_sync(), to recover the filename, remove extra
quotes and pass through printf.
Merge pull request #97 from jakob-bebop/develop

Fixed a problem with non-ascii characters in filenames.
Simplify wording
Merge branch 'master' into gh-pages
Hide C4819 warning (no UTF8 BOM).
remove the FILE parameter from TranslateClause, ReadClause and friends as it is not used
Added extra optional argument for create table command, as to whether or not the table already exists within the dbo structure, this is so existing tables are not overriden when performing the db check. Currently only set for the sqlsrv driver
Merge branch 'master' of github.com:ridget/yii_bk

Conflicts:
	framework/db/CDbCommand.php
	framework/db/CDbMigration.php
Claming color #149dd9
Fixes broken link in readme
Merging pull request #12
mascota arreglada
A small error that ocurred offline :)
i#950: Port security-win32.apc-shellcode test to Win x64

Uses split-file asm in place of hex strings.

Adds IF_X64, IF_X64_ELSE, and IF_NOT_X64 to asm_defines.asm.  The comma
versions of those macros were skipped because they are not usually
needed for asm.

Fixes issue 950.

Review URL: https://codereview.appspot.com/6719045

git-svn-id: https://dynamorio.googlecode.com/svn/trunk@1670 49cc7528-f6fd-11dd-9d1a-b59b2e1864b6
protect-dstack.
Merge branch 'release/v0.0.1'
Merge branch 'release/v0.0.2'
Merge branch 'release/0.1'
Add about_topic and user[:id]
Merge pull request #1 from hoop33/topics_and_user

Add about_topic and user[:id]
Bumped version to 0.1.1
If return empty string(invlid json), catch that exception and return Hashie::Mash.new.
Suggestions APIs.
Search API.
Groups APIs.
Merge pull request #3 from ybenjo/prototype_error_handling

Yammer APIs sometimes returns empty string(invalid json).
Merge pull request #4 from ybenjo/suggestions

Suggestions APIs.
Merge branch 'master' of github.com:roadly/yammer

Conflicts:
	lib/yammer/client.rb
Merge branch 'groups' of https://github.com/ybenjo/yammer into ybenjo-groups

Conflicts:
	lib/yammer/client.rb
Adding changes from ybenjo
Bumping to 0.1.2
Merge branch 'master' of github.com:roadly/yammer
Merge branch 'master' into develop
disable cleanup, messes up textareas
added gitignore
Merge branch 'master' of https://github.com/robwebdev/Vim
Puts in place the initializer file for the calendar_helper plugin. This is a old rails 2 plugin
Work done on T_TRADE, still not there yet...
Base Project Part 5
Push test with learning rate 2e-3, learning rates *NOT* scaled down in proportion to the number of ISTA repeats,
Use ASGD, starting at 400 epochs, with learning rate decay 5e-7
Attempt to replicate successful run on 11/20
minibatch size 10, 100 epochs pretraining
Repair after every 5th minibatch
L1 scaling is 9e-2, 200 sparse coding units,
encoding_feature_extraction_dictionary rows are normalized to 1.25/(num_ista_iterations + 1)
빠진 페이지 재커밋
bump dynamic_reconfigure
bump dynamic_reconfigure
Added rosdep definitions for SDL, SDL-TTF, and SDL-GFX development
libraries.
Merge pull request #113 from kyle-f/master

Add SDL, SDL-TTF, and SDL-GFX development libraries
add a way to not load images as part of config management
Added a new dataset, StanData, and documentation.  Fixed example in fitModel to avoid use of fetchData()
Models made with mm() are now just class "groupwiseModel," not "lm"
Merge branch 'issue103' into beta
dummy commit to test ci
* Better setup of rvm
update proj3
methods start with capital letters
replaygain: changelog & doc enhancements for GH-55
fix non-string value matching in SubstringQuery
commit
Merge branch 'master' of https://github.com/sanity/tahrir

Conflicts:
	src/main/java/tahrir/io/net/microblogging/MicroblogContainer.java
commit
commit
guess-jp-encoding
Fix compilation with 2.10.0-M5
Merge branch 'scalaz-seven' of github.com:scalaz/scalaz into scalaz-seven
buildery
minor updates for MPI+TBB
move string to locates
fix WindowManager destruction
Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem
hotkey window first version
More aggressive task scheduling, rewrote assertion to not fail when status update sent twice for whatever reason.
adjust exp show time
modified:   fungus-core/src/fungusCore.h
	fungus-core/src/fungusEvent.h
	fungus-core/src/fungusObject.h
	fungus-core/src/fungusRepository.h
L2Gen: fixed bug where getAnc button deletes current params.  Added a specific hardcoded exception within L2GenParamComboBox to not include the value ">0" where param-name is "aer_opt".
Upgrade version number from 0.1 to 0.2 (next step use instead 'mvn release:update-versions -DautoVersionSubmodules=true' when a version is 'finished')[#2]
add script for modifying sequence ID
add format option, some usage info
modified:   .classpath
	modified:   .project
	modified:   .settings/org.eclipse.jdt.core.prefs
	deleted:    sequential.xml
	deleted:    target/cucumber.json
	deleted:    target/cucumber/formatter.js
	deleted:    target/cucumber/index.html
	deleted:    target/cucumber/jquery-1.6.4.min.js
	deleted:    target/cucumber/report.js
	deleted:    target/cucumber/style.css
	deleted:    target/maven-archiver/pom.properties
	deleted:    target/surefire-reports/TEST-com.softcrylic.test.automation.SeqExec.xml
	deleted:    target/surefire-reports/com.softcrylic.test.automation.SeqExec.txt
	deleted:    target/test-classes/com/softcrylic/test/automation/newyork.feature
	deleted:    target/test-classes/com/softcrylic/test/automation/stock.feature
Init project
Import endea.maven
Import endea.io
Import endea.test
Git ignore
Import endea.meta
Init endea.core
Import entity from internal
Ref ...
Module ...
...
Import http
Import reflect
import reflect test
import http test
Import endea value
Import value test
Removed endea.test
Module as partial function
Moved endea.maven to tools project
v0.4.2
Merge branch 'release/v0.4.2' into develop
update translations, part1
update translations part2
trans bugfix
fix Iron Heart search one user found style
fix color
manual sync to shellex
Merge remote-tracking branch 'shellex/master'

Conflicts:
	data/index.html
change cap
fix cap
captials are not allowed.
add monitor.k
task #00007-Create_news_list_page: drupal update
Merge branch '00007-Create_news_list_page' into develop
Debug mode for Frontend

add a button debug mode off to frontend..
debug on: add debug=on to url or using login_as functionality
add a button delete to log and msg log.
conv post
added dxf testfiles
Simplifying require statement
Merge branch 'master' of git://github.com/simong/Hilary

* 'master' of git://github.com/simong/Hilary:
  Cleaned up groups.
  Fixed some lingering errors.
  Group work
Merge branch 'master' of git://github.com/simong/Hilary

* 'master' of git://github.com/simong/Hilary:
  Some fixes for issues that were raised in PR 3.
(Roles) Added roles module for OAE; Fixed issue with callback not being executed in initializeKeySpace; Fixed issue when no callback is specified in runQuery
(Roles) Document the dropSchema method of the roles API
(Roles) Improving documentation on data-loading.
(Roles) Moved schema operations outside of the Roles API
(Roles) Use getRole to determine hasRole, hasAnyRole
Merge pull request #5 from mrvisser/roles

(Roles) Added a roles bundle with data-loading script
(Tenants) Adding persistent Tenants module; No glue for app.js quite yet due to rapid development in this area -- trying to minimize conflicts
(Tenants) Initialize keyspace for tenants.js tests; Removing unused 'keyspace' variable from tests, not using custom keyspaces anymore.
Making the gitignore file alphabetical
Fix if statement
Merge branch 'tenants' of git://github.com/mrvisser/Hilary into tenants

* 'tenants' of git://github.com/mrvisser/Hilary:
  (Tenants) Initialize keyspace for tenants.js tests; Removing unused 'keyspace' variable from tests, not using custom keyspaces anymore.
  (Tenants) Adding persistent Tenants module; No glue for app.js quite yet due to rapid development in this area -- trying to minimize conflicts

Conflicts:
	.gitignore
fix random queries only being distributed over the first 2^32 positions.
Merge pull request #9 from mpetri/master

fix random queries only being distributed over the first 2^32 positions.
added license for es5 shims
Added js console.log macro
- Another try at the version
LuaInspect Setting
Add skeleton new class PkCorrelationModel
Add --mc-save option to save first MC sample generated to a file.
save-icov option only saves non-zero unique elements.
Streamline try…catch handling.
Remove debug printout.
Implement loadCosmolibDemo that mirrors loadCosmolib but expects a .data and .icov file in the standard format produced by the save-icov and mc-save cmd-line options.
Add cmd-line demo-format flag that uses loadCosmolibDemo instead of loadCosmolib.
Add a sample INI file that reads data from a new demo/ subdir in the cosmolib demo format. See demo/README for details.
Add explicit include for member data.
PkCorrelationModel inherits from AbsCorrelationModel.
Add new class to pkg header.
Flesh out Pk spline model.
Add cmd-line options to configure Pk spline model.
Re-parameterize normalization of Pk model.
Make the B-spline order a cmd-line parameter and add ctor parameter checks.
First implementation of PkCorrelation model evaluate methods returns fiducial cosmology, to check normalization factors.
Implement framework for adding generic B-spline contributions.
Plug in mathematica expressions for E(ell,m=3).
Take sine integral from GSL.
Generalize fit-smooth output with new cmd-line param alt-config.
Add PIL to requirements.txt
Move tabs on the profile page to the side, rather than on top.

This change was requested to avoid or delay interface disruption due to
membership in too many polities. It also allows for a cleaner interface.
User-supplied description and photo move into the summary tab.
Add settings page for user-facing configuration and profile contents.

Add new form, view and template for settings page, add link to settings from the
navbar and reorder navbar slightly.
Make profile slightly less placeholder-y.
Merge pull request #17 from anarchodin/profiles

Profiles
Speeing up Merge and Mask
Adding more test cases