labofsahil/github-event-dataset-2012 huggingface dataset:
Stripped test implementation and fixed LRU scheme in page_fault
Fixed test.c
Fix the empty/full stuff

It should now work completely
Merge remote-tracking branch 'slundqui/master'
Smaafikser pluss utestet versjon av baselinesystemet
Parser.write(): check for error and emit 'error'

This is the stream interface. Using parse() will not emit 'error'.
Parser.end(): check for error to emit 'error'
Fixed sign error and replaced porevol->porevol0.
Merge remote-tracking branch 'xavier/rock_comp_tpfa' into rock_comp_tpfa
Merge pull request #26 from atgeirr/ert

Make ert branch up-to-date.

Merged as of commit 3e8b6a3 .  Thanks.
Added perfPress() to WellState.
Update WellState::perfPress() after pressure solve.
Modified functions dealing with transport source.

In preparation for switching to new convention for inflow
sources in the compressible case: source being surface volumes,
not reservoir volumes.
Change interface for (blackoil) computeInjectedProduced().

Also use new computeInjectedProduced() and computeTransportSource()
functions in SimulatorCompressibleTwophase.
Bugfix: size of vector for A should be np*np.
Update compressible transport solver for new src convention.

Namely, that inflowing transport sources are water *surface* volumes,
not water *reservoir* volumes.
Increase output precision for ascii dumps.
Add explanatory comment.
Fix volume reporting with multiple transport substeps.
Fix mass balance reporting.

Multiple issues:
  - now reporting surface volumes, not reservoir volumes,
  - fixed reporting for the case of multiple transport steps.
Document appropriate structure fields.

Commit 642eaf6 introduced the correct documentation, but mixed the order
of the 'zcorn' and 'actnum' documentation.  This commit corrects that
oversight.
Merge pull request #39 from bska/tidy-cpgpreprocess

Document appropriate structure fields.
Merge pull request #38 from atgeirr/mods_for_surfvol_src

Changing transport source convention

Tested locally.  No regressions.  Merged.

Long-term, we may need to do away with scalar source terms though--at least for black-oil type problems.
Merge pull request #40 from atgeirr/fix_mass_balance_report

Fix mass balance reports

Thanks.  Looks good.  No regressions in testing.
Merge branch 'master' into ert

Conflicts:
	opm/core/grid/cpgpreprocess/preprocess.h
Implemented Multiyear feature.

Change-Id: I20c62c66ca03c294c5b00410a9d6e5af574fe4a3
Updated PaymentForm views and assembly.

Change-Id: I9b31fea8ec4535ee5fa817e33c69115e5780ff91
added supporting modules
Remove references to teams
making default sga executable the one in pinball/sga/src/sga -- adding rmdup option as a more stringent alternative to sga filter when indexing with non-zero error-rate
Optimizing data.uri setter
Implementing reverse chaining for promises
Returned $.repeating{}, fixed regressions relating to $.repeating{} in data store methods (e.g. data.expires = 1000), created utility.clearTimers() for internal clean up, refactored data.generate() to properly expire & recreate child data stores
Refactoring/silencing JettyCleaner
Refactoring GbvSip
Don't need to re-solrize each time
Override SLiMs tcp port allocation by passing in slim.port system property.
add a tip to the CommandLineOption page.
add reference in changeLog.
Fix NPE when searching for tags only.

Reported by Matthias Makulla
Only check for selected properties when performing search on properties
Increase text box sizes for symlinks table
Merge pull request #61 from idcmp/master

Override slim.port with a system property.
Fix NPE when searching for tags only.

Reported by Matthias Makulla
Only check for selected properties when performing search on properties
Increase text box sizes for symlinks table
Added favicon. Fixes #89.
Got IntelliJ tests to pass again using a horrible hack.  See comment in JUnitXmlTestListenerIntegrationTest
Open SlimTableFactory for custom table types. Allow table types to be configured via plugins.properties.
Revert "Minor performance improvement in deserializing lists"

This reverts commit 73cb9bef803e19852cb27ed017819e26f1cc03c0.
Forgot to load slim tables on startup
put table names in lowercase
Merge branch 'slimtables'. Fixes #110; fixes #117.
document: parser tokens quick reference
Merge pull request #119 from jediwhale/master

parser quick reference
Removed some empty else blocks and some array security fixes
Compatibility with the upcoming 0.8.7
Added some aliases
Added .screenrc
dont apply any overscroll behaviors if there is nothing to scroll. Closes #57
Added license file, changed travis stuff
Bumped version to 12.09.25.
Moved registerEntities from mast.js into mixins.  Added Mast.removeTemplateIds option.
Update Copywriting
Set a default URL for w3m to open
Braid: Update mirror 'dotirssi' to '91fcf2c'
Exporte: Anz Massn pro Pop ergänzt
Css optimiert. Verändern von Zahlen un number-Feldern blockiert
Modified the session-oauth code to not explode if shopify returns a 500
Wrong planet owner
added support for user-level man and bin directories (~/.man and ~/.bin, respectively)
[data_set] Normalize __content__ for weird TVDB cases
Update Gemfile.lock
Fix unit test for non-hashed CA directories.
add xsrf protection to forms
Finished up basic table view in detail view controller for now
start of autoscaling groups
Fixed stuff finally
working ASG table view, bug with group maxsize method call always returning (null)
Start of ASG detail view controller NIB and class
Moving ASG detail view controller to a generic UITableView for now
relayout of summary view
first run at adding vpc data tableview
Commit and push prior to starting relayout of view appearing code
Install last(1) as setgid (utmp) and drop setgid ASAP
Only allow root to see all entries for last(1).
Users will only see their own entries.
Allow user to see system events in last(1).

Use a whitelist to avoid accidentally leaking information in the future if new types
are added relating to user events.
Added a crash course about Search.
fixing warnings concerning random graph generation
adding classpath to gitignore
Merge branch 'master' into approxalg
7:31:24.03
15:56:08.73
That wasnt working... retry
16:56:11.58
SONAR-3708 Improve exception message from CodeReader in case of StackOverflowError
Fix some quality flaws
Fix violations
rationalize return values and update schema
minor bug fix when version numbers are fallowed by a '>'
Remove slogan beneath alice logo
Use the class of the element to be more specific
Update display ordering on asset show page
Use solr names for display fields, add short title to show page
Keywords is now known as alternative terms
Don't show the attached asset if it is fake.doc from import
Remove debugger
Add tiny_mce/langs/en.js to assets precompile
WIP: Try out the tinymce gem to get the asset pipeline to work
Revert changes to asset pipeline -- still cannot load en.js in staging, production
Multiple facets
OR facets for format, level and type
Fixed prepositions and made the seeds commit when complete.
Merge remote-tracking branch 'mediashelf/multiple' into develop
Build spelling index on optimize, not commit
Merge pull request #15 from mediashelf/prepositions

Fixed prepositions and made the seeds commit when complete.
Merge remote-tracking branch 'mediashelf/index_on_optimize' into develop
Bring back commits on save, destroy
Added a reindex rake task
Optimize when done with reindex, so that spelling index gets rebuilt
Update model to match requested fields for editor

- Make the search result show page display a title with no additional formatting
- Remove keywords column, replace with alternative_terms
always load the application if possible. fix #358
Add jsDraw2D library, v1.0.3 Alpha
Create circular-shaped player ship Component
Make all players Defenders for now
deleted confusingly obsolete makefile.
Ignore symlinks in the testing tree when using get_relocatable_dir/file()

Parent directory traversals (C<..> or File::Spec->updir()) are naively
canonicalized based on the test file path (C<$0>) so that symlinks
aren't followed.  This is the exact opposite behaviour of most
filesystems and is considered "wrong", however it is necessary for some
subsets of tests which are symlinked into the testing tree.
Merge branch '4.0/ignore-symlinks-for-relocatable-test-dirs' into 4.0-trunk
数据库结构备份
[mgr] Fixed default settings when create new ticket
Added profiler support and harmonized to dsInfo

Added support for inline profiling in LassoLab.

Harmonized dsinfo and dsInfo to dsInfo.
fix message built for engine dying during task

The test_z_<foo>_crash tests actually test this, but they have long-since been skipped because people don't like the crash dialogs some OSes give.
tag crash tests with @attr('crash')

instead of simply Skipping
skip crash tests by default
BUG: Block until kernel termination after sending a kill signal.
Py3k: Octal (0777 -> 0o777)
Merge pull request #2439 from bfroehle/py3k_octal

2to3: Apply numliterals fix for octals (e.g., 0777 -> 0o777).
Merge pull request #2369 from epatters/block-after-kill

Block until kernel termination after sending a kill signal.  This will make for more robust kernel restarting in the Qt console.
`sys.maxsize` is the maximum length of a container.

From the Python documentation:

> sys.maxsize:
>   The largest positive integer supported by the platform's
>   Py_ssize_t type, and thus the maximum size lists, strings,
>   dicts, and many other containers can have.
allow iptest to be interrupted

Previously `^C` would register as a regular test failure, and the test suite would continue, in which case halting `iptest` meant hitting `^C` nine times.

This change makes iptest take notice of sigint in a test runner, and aborts the run.
Merge pull request #2240 from minrk/stranded_metadata

fix message built for engine dying during task

would result in KeyError on missing 'metadata'
Merge pull request #2442 from minrk/signithalt

allow iptest to be interrupted
Merge pull request #2441 from bfroehle/sys_maxsize

`sys.maxsize` is the maximum length of a container.
Correcting some inconsistencies.
Adding new post
Fixing capitalization on tags
removed all other projects that were sharing the transmog repository. Will have individual repositories for such projects. Updated to Neo4j 1.8

removed all other projects that were sharing the transmog repository.
Will have individual repositories for such projects.
Updated to Neo4j 1.8
Added Lodd datasources.
Revert "removed all other projects that were sharing the transmog repository. Will have individual repositories for such projects. Updated to Neo4j 1.8"

This reverts commit f51c329189cde0a7eca5e17db6f89c7876b396fb.
Revert "Revert "removed all other projects that were sharing the transmog repository. Will have individual repositories for such projects. Updated to Neo4j 1.8""

This reverts commit c5bb7508cd0898d2786582a01d9b488d99d8abc7.
removed all other projects that were sharing the transmog repository.
Will have individual repositories for such rpojects.
Updated to Neo4j 1.8

removed all other projects that were sharing the transmog repository.
Will have individual repositories for such rpojects.
Updated to Neo4j 1.8
removed all other projects that were sharing the transmog repository.
Will have individual repositories for such rpojects.
Updated to Neo4j 1.8

removed all other projects that were sharing the transmog repository.
Will have individual repositories for such rpojects.
Updated to Neo4j 1.8
ignored all prefs files
User-Agent back to Amenoid/*. AmenHQ fixed their servers
Make `zic` at Travis CI.

Compilation of `zic` was removed from `make all` for the sake of OS X.
Travis CI can compile `zic` so we've added `make zic` to the
`before_install` section of the `.travis.yml`.

Closes #82.
Merge branch `zic` into `travis-ci`.
Added Google Charts at tapin/stats for simple lookup; TODO: Design
Updated monthly status chart
Trying to add some mobs
Hide days with no activities from log
Tranches now using LV2 Time
set defaults
more verbose
Fixing Login Deletion
added configurations to stats so this can be easily deployed to heroku
ReadMe fix

I accidentally a word.
explicitly scope the $::operatingsystem variable

that prevents the following warning being printed on puppet 2.7.11
(and possibly other versions):

"warning: Dynamic lookup of $operatingsystem at
/etc/puppet/modules/rvm/manifests/system_user.pp:4 is deprecated.
Support will be removed in Puppet 2.8.  Use a fully-qualified variable
name (e.g., $classname::variable) or parameterized classes."
explicitly scoped all operatingsystem variables
Merge pull request #44 from rradonic/master

explicitly scope the $::operatingsystem variable
Typo in the lib name
landing page stuffs
add performance data before starting to refactor
wrote a simple README
remove the 'index' attribute of pericope
simplified Pericope.parse_one by deferring matching to Pericope.new
don't need to declare &block if it isn't going to be used
ValidReference doesn't need to be inside of a begin…end
rewrite Perciope.match_all to match pericopes in order and to *not* use a nested loop

match_all is 2.25x faster!
rewrite Pericope.new to accept attributes rather than a MatchData instance

 - This will allow full pericope parsing to occur _before_ text is split on pericopes so that pericopes matched but found invalid can be skipped
 - Pericope.split is 1.8x faster
strip out codejunk, follow common Ruby conventions in iterators
simplified REFERENCE_PATTERN by replacing (a|b) with [ab]
don't capture what we don't need from the REFERENCE_PATTERN regex
clean more codejunk
remove trailing whitespace from TSV file
respond gracefully to inverted ranges
alter test that relied on deprecated parameter to Pericope.split
update README
Added Quickset block
importing courses now setup to create both child and parent meta course for cross-listed
altered to disable seeing enrollment methods, checking permissions, seeing other users in course admin menu
disable link to grade book from assignment admin menu
uncommented some previously commented out code that broke things
took out the link to my home
removed reference to $this->load_for_user() which loads all the profile information including private files (even if they're turned off)
removed having the course calendar link added
remove ability to assign local roles
remove ability to review permissions for people enrolled in the course
removed individual module backup and restore from the contextual settings menu
add theme rocket
changed get_config to refer to morsle rather blocks/morsle
have morsle_decode run on configged admin password
added in array_diff_assoc rather than just array_diff_key
If owner in group, made member first, then owner
seems like a good time to commit so I could get back here if I needed
:callbacks needs a hash, not an array
modified while
Merge branch 'master' of https://github.com/bowang1103/sc371
iter and next, but while loop broke
BZ813412 ensure that browser will not cache the immage by adding current timestamp into the url as query string
FIFO supported use new command -f for a pipe file
Support dir/list/single_file/fifo pipe
bug fixed... simple_check become all supproted
bug fixed
new -help command and new decription
list supported remove script
bloom name bug fixed
new good_build.c main function
new info file
remove bug fixed
new decontamination for henrik
new list supported version for mixed (MPI & OMP) parallel
new list supported version for mixed (MPI & OMP) parallel
bug fixed
bug fixed for mpi_contam detect
new mpi_decontamination program
indent code
max cut off bug fixed
scoring system bug fixed
scoring bug fixed
Fix line length formatting
Fix plugin function names

Renamed initialize and close so there is no conflict with existing
system libs (like libc).
Move ping/join/nick plugins into core bot

No need to have essential features as plugins; there are sufficient
examples of plugins now without them.
Made message send/receipt debug messages clearer
Change plugins to act on params `commands'

Instead of acting on an irc message's command, operate on a custom
command that is extracted out of the params of a PRIVMSG command.

If the PRIVMSG params begins with the defined command char, extract the
following token from the string and test it against plugin defined
commands to see if any will accept it.

This will allow for a documentation system to easily be built on a per
command basis in the future.
Add plugin name function
Fix memory leak
Giant refactoring of plugin handling

Add additional help methods
Change message passing to be based around src, dest, message, and
command (if included).

Remove quit plugin and integrate it in to core.
Rewrote variable UI
Added likes code and replaced int with long
Watch whitespace in shell scripts.
Added basic controls layout (need buttons still)
Merge branch 'master' of https://github.com/brooksjd/compbio
MENWIZ 1.0.2
Merge branch 'master' of github.com:brunialti/MENWIZ
Update web site to 0.7.2
remove meaningless FFFD data in to/_UAO{241,250}.txt
Update 6.1/i18n/zh_CN/source/usability_book/3. OpenERP's Views/List Views.rst
error message + demo notes
Fix time.Time calculation
Fixed a bug which prevented custom jCanvas methods from being added as layers

Also added a disableDrag property for easier toggling of draggable
states.
travis has 2.0.0-preview1 now! yay!
just one 2.0 build, and one ruby-head build
awesome. I broke the matrix build, too.
benchmark all the tasks. because we can.
no 2.0.0-preview1 on travis yet :(
update the rakefile to test rubygems 1.8.24
fixing installation issues
Adding support for checking multiple groups for a sentry user (much like the sentry-fuel repo).

Signed-off-by: Ben Corlett <bencorlett@me.com>
Using SQL timestamps rather than time().

Signed-off-by: Ben Corlett <bencorlett@me.com>
Merge remote-tracking branch 'origin/develop'
Ajout du lexer initial
Merge branch 'master' of https://github.com/ccompile/compilo
Header du lexer rajouté
VSphere vijava implementation for jclouds 1.4
Merge branch 'feature/jclouds14-vsphere' of github.com:ccustine/jclouds into feature/jclouds14-vsphere

Conflicts:
	labs/vi/src/main/java/org/jclouds/vi/compute/strategy/ViComputeServiceAdapter.java
Atualização do repositório, colocando as imagens nos lugares certos e atualizando o deploy.
Atualizacao da pasta deploy.
alles bereit
4/18/12 started intelligent scheduler
Can connect to BCHQ, get response
removing reversal of coords
db연결정보 ignore
remove attributes that came in from my .nixpkgs
added more semantic markup and removed repititon
samo zło
added runit cookbook to roles
2012-03-26 (tinybit)fix int15 handler, add bootlace64.com for Linux x86_64.
2012-04-12 (tinybit)removed low-mem holes for konboot to run ok.
  2012-04-18 (tinybit)trust low mem size at 0x413 instead of int15 report.
  2012-04-16 (tinybit)enable floppy partition access for parttype etc.
 2012-04-25 (tinybit)fixed a bug on failed dd argument of "buf=".
Revert "update"

This reverts commit cc3f26b3693d9e66a680f61d0c22516d7f317115.
renamed:    CXXSOCKET/makefile -> CXXSOCKET/Makefile
	new file:   im/Makefile
	new file:   im/client.c
	new file:   im/global.c
	new file:   im/global.h
	new file:   im/note.txt
	new file:   im/server.c
Made massive progress on time delta histogram process
upload firefox readme
Better argument parsing for SearchInColumn patch by Matěj Korvas, thanks!
Make some possibly destructive commands more interactive
Exam prelim
Delete principals, refs #98.
Update german translations, refs #98.
Only fire UserDeleted event when a user was actually deleted. refs #98
Check if we have a group before doing group specific operations. refs #98
Merge branch 'master' of github.com:Pylons/Kotti
Remove option to set a new owner for the content of a deleted user.
Update translations.
Merge conflicts in translation files.
Recompile german translations.
Changelog entry.
Release 0.7
Version bump
Merge pull request #115 from j23d/master

Delete users.
Update changes.
Add pip requirements file.
Picked a bad version of mock.
Fix #117 : can't add a tag to an existing image
Merge pull request #118 from tonthon/master

this one seems to fix #117 
pep8, fix indentation.
Merge pull request #119 from j23d/master

pep8, fix indentation in test file.
Improvements for the vimrc file.
.gitignore added, more text in README.md
adding indent guides plugin
Take utility out of the equation.
Overlap queued decrementing with staged incrementing.
Decrease the queued count with stratum work once it's staged as well.
Only set lagging flag once there are no staged work items.
Merge branch 'master' of github.com:ckolivas/cgminer
Add missing include dir for tests in tests/Makefile.am
building Structure
Merge branch 'master' of github.com:clevertech/WSWPN
Marcel local
CFID-333: fix ordering problem in tests

Change-Id: Ibb0ecf322ddb098dfe5c6747bc0f408a6ad6d58f
Update notes for submitted changes

* Fix broken integration test
Update notes for submitted changes

* [cfid-196] allow familyname and givenname to be null
Update notes for submitted changes

* initial scaffolding for thor-based cli.
change commands to accept list of apps or --name

* e.g. start app1 app2 app3

Change-Id: Ife1ce32cd7e2c4e3259c39657890634448961b2a
tabular info --services/frameworks/runtime format

Change-Id: Id4e2df31c72fc24c075f782dddf6296ff2ef989a
don't indent for quiet output

Change-Id: I2008996d041698bff7532c018a68279055e839d5
Update html/intro.php

added padding to tutorials section. Readded submit button.
[releng] :prepare release RELEASE-0.9.2
[releng] :prepare for next development iteration
confliction
Merge branches 'edward' and 'master' into edward
confliction
Merge branches 'edward' and 'master' into edward
New update
Merged
Changed from md to rst
Added pascal string support; explicitly import NSColor, NSColorSpace
Merge branch 'master' of https://github.com/cochrane/TRPoser
scaled map image
Merge branch 'master' of https://github.com/codecentric/thot
scaled img
add test.txt
README gone statement
looking good
Change detail view to UIWebView
add DragonWebApp
add DragonWebApp and static files
add webapp code
Merge https://github.com/coderplay/dragon
fix task bugs
Merge pull request #89 from yelcat/master

#89 Merge code from Chenzhan. Issue #76: Web UI for jobs/tasks/attempts
Add AddProject method to TeamService
add test cases for configurations
Adding in drop menues for selecting Artists and Venues. Closes #2
Merge pull request #13 from coogie/scaffold-relationships

Adding in drop menues for selecting Artists and Venues. Closes #2
merge upstream
Preparing repository for splitting cookbooks into their own repos.

* Add a CONTRIBUTING file to each cookbook.
* Move the Changes/Roadmap section(s) to CHANGELOG.md.
* Create the Apache LICENSE file in each cookbook.
Merge branch 'master' of github.com:customink/cookbooks
[COOK-1087] Update the CONTRIBUTING file to fix a minor typo
[COOK-1195] adding aws_resource_tag LWRP for manipulating resource tags
[COOK-1195] call new_resource.updated_by_last_action as appropriate
[COOK-1195] implementing load_current_resource method and updating provider logic to use @current_resource
Merge pull request #1 from needle/COOK-1195

[COOK-1195] adding aws_resource_tag LWRP for manipulating resource tags
[COOK-1221] Converst node attrbute accessors from symbols to strings, per FC001
Support other regions besides us-east-1
Merge pull request #3 from jjhuff/master

Support regions besides us-east-1 in the ELB provider
Merge pull request #2 from miketheman/COOK-1221

[COOK-1221] Converts node attrbute accessors from symbols to strings
release v0.100.0
increment version for development
FC016: LWRP does not declare a default action.
Merge pull request #5 from kotiri/foodcritic

FC016: LWRP does not declare a default action.
Adds reviews and nominations

 - javascript is hacky
 - ember would be much better for this
Closed/errored database connections are now reinitialized
Change datetime to timestamp, added password salts
Fixed to make 'gem test' work.
cambios en el buscador de proyectos 2.0

agregue los n's
modify bootstrap, add dummy paypal buttons, restructure footer
refine footer, add actual PayPal buttons
deleting old test directory
adding files to make autotest work
dropping login for admin and adding admin functionality in drop down menu also removing admin template headers
fix twitter client on < iOS 6
Added ProcessAsStreamServer; Use Objects instead of Check.notNull()
settop cleanup
appogio
Fixed slider bad placement
Fixed media uploader conflict.
Added command-t back because I think its faster.
Merged latest SB commits
quality enchantments

seperator can be anythin (not just .) readded hdtvrip
added webhd to HDWEBDL
merging changes from master
fixed gitignore
added btn provider
fixed btn merge issues
force german when bulk adding shows
fix for repack and xvi-d releases
fix xvi-d in sddvd
fixed nzbindex
changed nzbindex to take 50 newest releases
my last master merged
removed not working stuff
complete!
refactor
esborrat fitxer temporal
Snapshotted flickcurl_1_23 for 1.23 release (GIT 29b6f5b550599ce9398504b975c784eac4cb2ba1)
Did a lot of work. Supporting Panel4D and more complicated groupby logic
with ColumnPanel
Removed C-g prefix binding
Refactored ToDo list into its own template and now return it from the AJAX action
Merge branch 'master' of github.com:damonjones/To-Do
Added Profiling tests
Update Lines to conform with behavior of normal OpenACD objects
refactored function definition and resolution
Fixing a bug preventing eating food from working
Fixing some bugs in the new simple dungeon generator
Sync Italian translation of d-i manual

git-svn-id: svn://svn.debian.org/svn/d-i/trunk@67986 48c42b26-1dd6-0310-b98f-a58d8bce7237
prepare-release-announce: Warn when changes cannot be gathered.

git-svn-id: svn://svn.debian.org/svn/d-i/trunk@67987 48c42b26-1dd6-0310-b98f-a58d8bce7237
prepare-release-announce: Implement --{old,new}-freebsd-abi (for FreeBSD kernel ABI bumps).

git-svn-id: svn://svn.debian.org/svn/d-i/trunk@67988 48c42b26-1dd6-0310-b98f-a58d8bce7237
Fix typo.

git-svn-id: svn://svn.debian.org/svn/d-i/trunk@67989 48c42b26-1dd6-0310-b98f-a58d8bce7237
amend README
adapt git-setup script for our new git repo
use our s-i and sprezzos-installer repos
use https://git uris
use --depth 1 for all git checkouts
--depth 1 cannot be processed by k-shitty mr
don't check out tons of crap we're not going to use
merge
use --depth 1 for all git checkouts
--depth 1 cannot be processed by k-shitty mr
don't check out tons of crap we're not going to use
use --depth 1 for all git checkouts
--depth 1 cannot be processed by k-shitty mr
use --depth 1 for all git checkouts
--depth 1 cannot be processed by k-shitty mr
Merge branch 'master' of github.com:dankamongmen/s-i
pull from upstream
Conflicts:
	.mrconfig
added support for suppressing prerotation
Make sure the DWC OTG host mode channels are given enough time to disable.
MFC r238309:

In epair_clone_destroy(), when destroying the second half, we have to
switch to its vnet before calling ether_ifdetach(). Otherwise if the
second half resides in a different vnet, if_detach() silently fails
leaving a stale pointer in V_ifnet list, and the system crashes trying
to access this pointer later.

Another solution could be not to allow to destroy epair unless both
ends are in the home vnet.

Discussed with:	bz
Tested by:	delphij
MFC r239075:

In tcp timers, check INP_DROPPED flag a little later, after
callout_deactivate(), so if INP_DROPPED is set we return with the
timer active flag cleared.

For me this fixes negative keep timer values reported by `netstat -x'
for connections in CLOSE state.
MFC r239383:

In ip6_ctloutput() guard inp_flags modifications with INP_WLOCK.
添加da库支持
更新package_source内模块资源文件
更新da_source_1.3.5.js文件
replaced Int with Number
added more listeners
added client.js
added webserver which visualizes joins/parts/msgs
(EXPERIMENTAL)
fix manything...
New info about Pangool Snapshot Repository
Add an option to use external ip of machine for host to mozhttpd utility

A bit easier to just specify "-i" than to have to find out the external
ip and then pass it through the "-H" option.
Merge pull request #8 from wlach/master

Add an option to use external ip of machine for host to mozhttpd utility
Bug 739368 - adds the shutdown import to mozlog which was missing;r=jhammel,r=jmaher
Bug 711520 - Allows mozrunner to point to Mac binaries
Merge pull request #9 from dglol/bug-711520-fix

Bug 711520 - Allows mozrunner to point to Mac binaries
Update licensing headers for new MPL 2.0 boilerplate
Add newlines after license headers
Merge pull request #10 from wlach/master

Updated boilerplate
reset() fails because it appears to be accessing 2 variables in the AddonManager but they dont exist, assume they were removed/renamed. I have added 2 properties to return the variables I think its after as well as a test for reset
added an s to the variable
Merge pull request #11 from AutomatedTester/bug_751348

Bug 751348 - reset() fails because it appears to be accessing 2 variables r=jhammel
Bug 751348 - Bump version of mozprofile to 0.3
Minor variable name fix from bug 751348
bumping version number to 0.3.1 for mozprofile
Sync devicemanager with latest changes from mozilla-central
[Bug 754338] put setup_development.py shebang back in;r=wlach
Bug 752890 - Don't print output of running process if other handler spec'd

It can be difficult to disambiguate firefox's output from other things that
one might want to monitor, so let's make the "dump everything to standard
out" behaviour more optional.
Bug 754370 - allow BROWSER_PATH to pass through mozrunner.Runner.create() method;r=wlach
bump mozrunner version to 5.3
Bug 746239 - Add support for running in a debugger to MozRunner;r=ted
closed PTOs on separate tab
if you type the message in(locked Gemfile)
remove wrong argument
Merge branch 'master' of https://github.com/dbushell/Pikaday
use hostname for cloud
Adding postgres to gemfile for Heroku
Moved deprecated View class into its own module.
The Renderer class now creates a SpecLoader when necessary.
Added a unit test for rendering a TemplateSpec instance.
almost all expressions covered in parser. lacking anonymous (won't handle) and casts + small stuff. Some divergence from haxe syntax (simplified) for subset required for nape
remove swap files, added to .gitignore
add missing vars expression
full (subset of haxe) parser done :)
add HaxeStrip to run emulation of haxe preprocessing
fix stripper, and dodgy float regexp in parser
deal with ambiguities with semicolons, add array access expression and lots of memo() to optimise
Removed useless helpers
Adding basic canvas support as a starting point. Needs optimisation and the removal of code duplication.
Created a common CompatibleObject base class from both ImageObjects and CanvasObjects.
Using slightly more obvious function syntax
Renamed AlHost.widgets -> AlHost.root
Implemented keyboard focus

Added AlHost.keyboardWidget
Added grab_keyboard and release_keyboard commands
Added keyboard lost event to AlWidget
Added text processing commands
Implemented a text box widget
Updated SConscript with new files
rm migration form default deploy
only show the path and the query of the uri, the hostname and port are not important
clean code
Merge pull request #8 from devbliss/feature/do_not_show_hostname

Feature/do not show hostname
merge develop
Fixed path separator issue for Windows systems
Added file change notification and possibility to disable caching for posts

Two new settings in settings.json:

"watchFiles": activates file watcher for directories having
markdown-files. if "true", useCaching is automatically set to false

"useCaching": if true, pages are cached, otherwise they are built from
scratch

It's possible now to have a local installation that updates while you
are writing on your markdown files. Set this to false for a public
installation to which instance you publish your posts.
comentando o teste de busca
Merge branch 'master' of github.com:dextra/dextranet
Trying the Heroku recommended socket.io settings.
Insert FIOC breakpoints with C-b in insert mode

And maybe normal mode if C-b isn't doing anything else in your terminal
Don't force UTF-8 on prgmr

I'm pretty sure I fixed this locale stuff a while ago and this line is
just messing with git merges at this point.
fixed some bugs
Merge branch 'master' of github.com:di0fref/exporter
fooked serializable and reading special chars like éñê
Merge branch 'master' of github.com:dianagr/Scrabble
fixed encoding problem in abstract and sammanfattning
Correcao tags no video selector
Merge branch 'develop' of github.com:diegofaria/Tedza into develop
actualizado manage.py
重构整体结构.从cc-core抽取出cc-web
V2.2.9

- added pulse handler, using the camera for determining pulse. You will
need to add the AIRS heart rate widget to your launcher screen to start
the heart rate measurement!
- improved BT beacon shutdown
allows replays
very crude aggressive ai
added dataset provenance
added miriam namespace
changed prefix
Added homologene namespace to ns.php
Merge pull request #11 from dklassen/homologene

added homologene ns
Added to list of namespaces for GOA and UniProt parsers
added new namespaces, base uris and alt-uris for support of bioportal sparql endpoint
added id check
Merge remote-tracking branch 'origin/master'

Conflicts:
	ns.php
Merge branch 'master' of git://github.com/alisoncallahan/php-lib into alisoncallahan-master

Conflicts:
	ns.php
added aspgd
Added CCDS entry to ns.php
Merge remote-tracking branch 'upstream/master'
Added namespaces to ns.php
Minor fix -- added missing commas in ns array
Merge pull request #13 from alisoncallahan/master

Added UniProt xref namespaces and synonyms to ns.php
addition of type declaration properties
Merge remote branch 'origin/master'

Conflicts:
	ns.php
enable and ignore # initiated comments
fixed buffer allocation
Fix Eclipse project files
Replace System.out with Console.writer()
Merge branch 'master' of github.com:bpelunit/bpelunit
Added search term to Result
Fix PathsTestCase
AS7-4185
AS7-4185 Try and cut back on connection testing
AS7-4578 Upgrade PicketBox to 4.0.8.Final (includes fixes for the TCK connector tests)
[AS7-4611] Check we are not running in silent mode before checking if we have a console.
upgrade hornetq 2.2.16
[AS7-3427] Merge of cli archive command with deploy command
[AS7-4594] fix messaging socket-binding resolution

* do not resolve the hostname associated to the addresses passed
  to HornetQ transport configuration *unless* the address is a loopback
  these adresses will be serialized and send to the clients "as is" so
  that he can connect to HornetQ with the same value written in the
  configuration.
[AS7-514] Enable per-deployment logging. Use custom log4j log manager.
merge changes in install.sh
created train destination name map
cached stop id and parent id map in database
highlight connection curve on hover
add models job and evaluation
Modify Model w :through
Verify user from old database
migration change column as date
PanelControl for user's roles
Mailer kend
Contract
Contract files
conflit top_section
put_contents: new method in File class
Forward log messages from Sbt to the sdt.core logger.

Made ClasspathManagement use a self-type.
[refactoring] Use `fs` instead of `path` for node v0.8.x
[update packages] inflection->1.2.2, node.flow->1.1.3, node.packer->1.0.0, rmdir->1.0.0, thunder->0.1.4
v0.9.9
fixes warnings and compilation on linux
sending comment for post in show view
Overhauled Look and feel of the admin side of things. I think the user aspect is going to be needed sooner than later.
IE issue with display identified. Working to correct.
CSS - correcao fonte EM titulo paginas categorias
adicionado observação
Finished Derek
Added switch for legacy file watch mode
equality problem test
adoc -> doc, amodel -> model
remove renamed folders
github.txt
Deny connection on same flight.
Elias update joinfiles.r
Added Flashcard delegate
delegate
Function `h' now uses `awk' instead of `grep' to find matches.
Now it's possible to pass several keywords (regexps indeed) to match a
history entry:

    $ h svn grep
first committed

hello.world!
new homogenized benchs
adds results for fateman
Add jst.eco file extension
added splice vim plugin as submodule
Compile fixes for mingw32
Primitive tactic descriptions
Remove optional hard-drop animation.
Limit board size to 100x200.
Fix premature hard drops on speed-1 AI.
#15, changes to the backend, fixing a couple bugs and using date formatters
Merges
Fixing classpaths
updating gemfile

Signed-off-by: RMacy <ryan.w.macy@gmail.com>
Fixed some typos in README and added a link to EWB.
Espace twitter message in URL
Add the md5 sum calculation script
Renamed abstract validator. Relates to #53.
allows yielded template blocks to be optional
Fixes for XSS vulnerability - refs #699
RenderBuffer now properly escapes non-string attribute values
Support making Computed Properties cacheable by default
Added ComputedProperty#volatile to turn off caching
Load debug before metal
Flag for making CPs cacheable by default
Test CP_DEFAULT_CACHEABLE
Don't show warnings in phantomjs
18_12
location bar no sdk
Updated js codestyle to more match jslint
Merge branch 'master' of github.com:enonic/dev-tools
Update submodules to current pre-2.1 version supporting LESS

Enyo-DCO-1.0-Signed-Off-By: Ben Combee (ben.combee@palm.com)
dia 2 y 3
Tidy etc
Now showing only the user's points
Added: CDN Article
New item form added
Transformed models, controllers and views to scaffolded.
Applied bootstrap theme to all.
NEXT:
* Put item name in the item_price combo
* Change 'destroy' to 'consumed' and archive it
added CaT lines to galaxy line list
updated spectarget and spylot for traits 4.0 compatibility
Update jQuery/pinterest-position/jquery-pinterest-position.js

정렬된 후 보여질 수 있도록 기능 추가
port is now char*
Alerts marked as read on popup
Return list of current tabs (no images yet)
Bug fix on framd aliases
Hanging curtain effect.
Realizing that 3d transforms on masks can only apply to elements, and masks on the page can't arbitrarily mask other things that have different shapes.
extended fallback code when using symlinks for file systems that don't
support them (extended from a NotImplementedError to a more generic
Exception)
Merge pull request #293 from abarani/database-symlink

extended fallback code for symlinks on file systems that don't support them
updated powerline and tmux utf8 characters
Update CSS and html
commit-011
Add event hooks from pull request #48
Merge pull request #14 from fabianofranz/dev/ffranz/refactor/snapshot

US2817: 100% code coverage
pass the rest_client to the SSHWizard not the user and password
add new gear_group model
add getting applicaiton status
initial gear group coverage
Adding support to context in arguments
Improved support for context args, validates ctx args and lists in the same command
Remove tornado.database, which is now distributed separately.
May be some bugs in here
Think I cleaned it up. Good riddance!
mini refactor in build_attr_name method
adding yui351 to the project (todo => replace yui2 by yui351 in code)
???
- Use personal artifactory as mirror
Fix poll() timeout value passed to libzmq since

zmq2x expects microseconds and zmq3x miliseconds
Added support to users with multi-process
Added support to users with multi-process
Cosmetics RPC Module
Cosmetics RPC Module
Put integer literal construction into Scheme.
Get rid of need for stddef.h and stdint.h in config.

Make config non-portable. But removes obligation for
stdint.h to exist and define the required types.
Lame excuse for Windows and other stupid platforms
that use the licence to not define int types.
Merge branch 'master' of github.com:felix-lang/felix
Change the colour of doc comments //$ in flx2html to green.

Also elides the //$ to make the source look cleaner.
Transform old array index notation to new notation.

Library and tools. Done by commenting out subscript
in array class. Remains to fix regression tests.
fix FC for samsung fuckup, fix sip/websms prefs in RuleEdit; issue #767, #765
add LogProvider from ub0rlib
fix OOME
bump to CallMeter3G v3.6.4
validate if(TODO validate value structure)
TextIndent object and its declaration.
completed Collection.getByMoodTag
Merge branch 'jeremy' of https://github.com/fightbulc/deezer into tino
Merge branch 'maciej' of https://github.com/fightbulc/deezer into tino
stuff
switched votes to stories from memories
Merge branch 'jeremy' of https://github.com/fightbulc/deezer into tino
Merge branch 'maciej' of https://github.com/fightbulc/deezer into tino
web collections
tag page
Fixed a potential crash when a merc dies.
Finally fixed CalcMaxTossRange so that it pulls the correct grenade launcher item instead of just the first one, thereby allowing more than one range value per set of launcher items that launch the same grenades.

git-svn-id: https://ja2svn.dyndns.org/source/ja2/trunk/GameSource/ja2_v1.13@5211 3b4a5df2-a311-0410-b5c6-a8a6f20db521
Added: Episode list viewtype
ПП
work on 2.2
add image +-
Merge branch 'master' of github.com:fishfinger/MASTA
Go to
Fixed typo in docs/transports.md
Adding reference to 'Working with transports' section
Adding last sections to the table of contents
Merge pull request #160 from tUrG0n/master

Additions to the documentation
Proposal of slicing implementation
trying to select patient name
Rename ConfigType to orx_config_util (moved static functions to namespace)
Refactoring du graphisme
Merge branch 'dev' into recette
Merge branch 'dev' into recette
Merge branch 'dev' into recette
Merge branch 'dev' into recette
Merge branch 'dev' into recette
Merge branch 'dev' into recette
Merge branch 'dev' into recette
Merge branch 'dev' into recette
Merge branch 'dev' into recette
Correction des menus
Merge branch 'recette' into dev
fix #2052: wrong tag counters in tagged list
collect static in fab
fix changes api
core: fix link with gcrypt lib in cmake (use var $GCRYPT_LDFLAGS instead of "gcrypt") (bug #37373)
doc: add japanese scripting guide, update japanese translations and docs
core: update ChangeLog (add japanese scripting guide)
add safe_strntoll and incr, decr is workable now.
ops
enabled adb (and logcat)
Mount cust.img at rewriteable
enabled init.d scripts
added genokolar's boot script
Actualiza back up base
Remove temporary script which has been run on server.
[kernel] refresh 3.3 patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33887 3c298f89-4303-0410-b956-a3cf2f4a3e73
Updated alpha_file
Add example call of the cmdoh command.
SRM 297 DIV 1 EASY OptimalQQueues
TagParse: remove TagError and use Parsec's errors instead
TagParse: shorten
add :user-exec permisson to shly.
added a newline.
updated bin/shly.
if not after 10 oclock, default yestoday
point updateCategoryLinks eventlistener to new list url.
Categories regex updated.
Separated categories request/processing from methods from giant mymovies methods.
CRM-10784 (4.3) is_primary handling fix for api to prevent extra records
[5] Generate only the amount of randomness needed; don't buffer\!
add global LWP::UserAgent for mocking in testing
add first tests
fixed attachment migration
crowd osx
Include docs generator and compiler in repo.
add DataBuffer and test
Properly aligned labels and textfields.
add hooks to Z80 core for applying memory contention
Start implementing special-case contention delays
"short" kernels no more needed
App name - Home Health
minor change to feedback table
Javascript async load
condition on returnFieldSelector if negated
Merge pull request #69 from gchatelet/patch-1

condition on returnFieldSelector is negated
Changed line endings to LF (issue #71)
The alternative back ends are only compiled now if the corresponding version is set.
Avoid usage of deprecated functions (see issue #70).
Merge branch 'master' of github.com:rejectedsoftware/vibe.d
fixing bad Json deserialization to struct
Use GeneralStatsBuffer
Note the version of solr that the schema works for
Merge pull request #262 from simensen/solr

Note the version of solr that the schema works for
Warn on similarly named packages. refs #109
Merge remote-tracking branch 'simensen/warn-on-similar'
Cache bust
Make sure the date isn't empty.
Twitter newsfeed
Web: Cut also the input source code at the online demo report
Web: Group online demo report by line numbers
Use proper naming conventions
Added Twine logo
Added Groupon Logo
Don't show blank page in carousel - fixes #124
Tweaked logo ordering
Updated Twine logo
Update jsFiddle link
Add TradeGecko to about page carousel
Merge pull request #121 from bradleypriest/master

Added TradeGecko to carousel
Added GroupTalent logo to carousel.
sending OSC
new image fixed
Merge branch 'master' of github.com:ging/vish_editor
Merge branch 'master' of github.com:ging/vish_editor
Merge branch 'master' of github.com:ging/vish_editor
problem fixed with object positioning and style
Tagit library updated. More features
Minor change in tagit library
Support and interface for live objects: first step
Merge branch 'master' of github.com:ging/vish_editor
added new css fix to carrousel
Image path for carrousel generic object fixed.
Main html refactoring
removed two lines that moved the css file
New vish editor version and css changes
new images and css and html changes
image changed, css fixed, walkthrough finished.
Merge branch 'master' of github.com:ging/vish_editor
New Walkthought for live tab
first version of scaling slides to screen size
Merge branch 'master' of github.com:ging/vish_editor
RESPONSIVE FIX
QUIZ refactoring
removed the slow-loading google font
materiale del corso
supported tile urls to be an array
build
Removed the need in Perl to generate ZIP archive of nginx/Windows.
修改盘点，盘点主库区633条数据需时间约4分钟
Signed-off-by: loou <loou@vip.qq.com>
修改入库单非货位移库方法
Signed-off-by: wu <981145751@qq.com>
Merge remote-tracking branch 'thok-zxl/master'
Merge remote-tracking branch 'thok-wyl/master'
入库主单、移库主单、损益主单代码整理
Signed-off-by: wu <981145751@qq.com>
修改手动入库树形方法。
Signed-off-by: loou <loou@vip.qq.com>
Merge remote-tracking branch 'thok-zxl/master'
Merge remote-tracking branch 'thok-wyl/master'

Conflicts:
	code/Authority/THOK.Wms.Allot/Service/InBillAllotService.cs
增加移库细单新增时单位选择功能
Signed-off-by: wu <981145751@qq.com>
Merge remote-tracking branch 'thok-wyl/master'
修改车载完成后的入库时间
Signed-off-by: loou <loou@vip.qq.com>
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git
修改移库细单移库数量判断
Signed-off-by: wu <981145751@qq.com>
查询分拣调度作业的数据排除已结单的数据
Signed-off-by: loou <loou@vip.qq.com>
Merge remote-tracking branch 'thok-wyl/master'
Merge remote-tracking branch 'thok-zxl/master'
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git
jquery.easyui 升级到1.3
Merge remote-tracking branch 'thok-zxl/master'
修改车载任务排序；
所有页面增删改查快捷键设置完成
Signed-off-by: name07 <122419795@qq.com>
组织结构管理打印
Signed-off-by: NameJun <122419795@qq.com>
Update Node.gitignore
Merge pull request #470 from pronebird/master

node_modules
The Lithium app should be the root repo folder
Merge pull request #425 from nateabele/patch-1

The Lithium app should be the root repo folder
replace saveTask w/ own implementation
Timetable page listing is complete, and some errors are fixed.
Icon displaying has been re factored.
Client side part of the uploading has been implemented.
TeachersPage save has been implemented.
Edit has been implemented.
Delete has been implemented.
Edit has been implemented.
Auto focus implemented.
When in a model, enter key now posts the form.
Session error has been fixed.
Corrections.
Sub menu and NuGet auto restore have been added.
Flattening and change from subject def/ref to node def/ref
Added flattening API call and algorithm implementation.
Update framing algorithm using new flattening algorithm.
Fix bug expanding datatypes with @vocab.
Version 0.1.6
Merge remote-tracking branch 'origin/master'
I/O slide
new version 0.1.23
Replaced 'gem environment gemdir' with 'bundle show'.
更新Readme

更新Readme
add a multi-threaded testing program in p-honnuhash
Checksum recomputed after changes to connection - DN
Add: new fancy looking web interface
Update to Release 121017, New webinterface, See README for further details
Added clear function
Added "finish" function
Fixed bug ticket 37
Fixed bug ticket 39
Fixed bug ticket 38
Fixed bug ticket 40
Little clean up
Clarification in names of fields
Fixed bug #44
Little optimization
Added setters 
Prevent player get rewarded when zombie get despawned
Little optimization
correct method name
Added "removeReward" on removeZombieCallback to prevent remove rewarding
when unnecessary
Reseting target when setting no attacker
Little optimizations
Doc
Fixed null pointer
Corrected method name
very wide 'w' was ugly and not needed.
stats.cpp now only opens file once when writing statistics for individual star.