labofsahil/github-event-dataset-2012 huggingface dataset:
began to implement multi threaded tessellation
chunks were retessellated every render/draw call
implemented threaded tessellation
fixed vram counter
filter the chunks before passing them tho task_pool.parallel
Merge branch 'threadedtess'
Added a test for stdio
Added generic functions for adding key value pairs to the HTTP header
fix rhino dependency problem, should work in all build environments now,
and no longer using js.jar in rhino/lib any longer, it's only there for
buildLegacy
removed finalize method, causes weird (but seemingly harmless) errors in
Tomcat
SafeInvocation Compile rhinzugefügt. Query/Not Equals Problem aufgedeckt und gelöst.
Fixed final problem
Fixing some typo.
Fix bug related to custom tags.
heroku v_3
heroku v_4
heroku v_5
heroku v_6
heroku end_v
create initial ref app project
Add an annotation field as required by the specification when muxing Sun AU.

Reviewed-by: Paul B Mahol
Support G.722 in Sun AU.
riff: fix decoding of 24-bit packed int (type 1, 20-bit)
omaenc: abort for unsupported codecs

Signed-off-by: Paul B Mahol <onemda@gmail.com>
omaenc: remove superfluous "OMA: "

Signed-off-by: Paul B Mahol <onemda@gmail.com>
wvenc: multichannel muxing

Signed-off-by: Paul B Mahol <onemda@gmail.com>
rl2: return meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
ADPCM IMA Dialogic decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
codec_desc: provide aliases for PCM A-law/mu-law

Inspired by d21b82fd3a72751a77dbeda3aa17a3af5e009565.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
codec_desc: mark PCM A-law/mu-law lossy

Signed-off-by: Paul B Mahol <onemda@gmail.com>
omadec: remove stale comment

Signed-off-by: Paul B Mahol <onemda@gmail.com>
mmf: signal EOF

Signed-off-by: Paul B Mahol <onemda@gmail.com>
mmf: simplify code by using FFMIN

Signed-off-by: Paul B Mahol <onemda@gmail.com>
c93: signal EOF
Fix type of default value for v210 decoder option -custom_stride.

Reviewed-by: Paul B Mahol
ra288: Check block align.

Fixes OOM
Fixes Ticket1893

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
atrac1: Check block align.

Fixes OOM
Fixes second samples posted in Ticket1893

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
mov: remux AALP tag

AALP(AALP001) tag is present in 32bpp files encoded with avid codecs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Fix reading past the end of frame buffer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Revert "Remove libvorbis Vorbis decoding support.  Our native decoder is complete"

Its useful to support the official decoder for comparission and debugging.

This reverts commit f9def9ccc6ecfe1778d4daa62a7ada27b5f79bfc.

Conflicts:

	Changelog
	configure
	libavcodec/allcodecs.c
	libavcodec/libvorbis.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg: do not report EOF as an error.

Not all processing goes through filters,
so processing can continue even when
all filtergraphs have reached EOF on all sinks.
avfiltergraph: fix format selection.

The old code had two bugs:

For audio filters, the format was not set.

For video filters, if several links reference the same format list,
the same format must be selected in the end. This is done by
setting formats->format_count to 1: the other links sharing
the reference will therefore have only one choice.
If the heuristic does not pick the first format, the selected format
must also be moved to the first position.
Add missing newline in shorten decoder.
ffmpeg: Fix initial dts for streamcopy, if the input packets lack dts.

Fixes Ticket1138

Based on a patch by: Eelco Lempsink <eml@tupil.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
matroskadec: fix incorrect unsigned->signed conversion
matroskadec: refactor matroska_decode_buffer

Make MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP behave like
the other encodings and spare few lines of boilerplate code.
matroskadec: return meaningful errors in matroska_decode_buffer
Merge commit '8d4dd55c37b14ecea596f3477b35bf6c20688d8b'

* commit '8d4dd55c37b14ecea596f3477b35bf6c20688d8b':
  matroskadec: refactor matroska_decode_buffer

Conflicts:
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'c9a39cec70603f662f4c326b21b11c4f0112079a'

* commit 'c9a39cec70603f662f4c326b21b11c4f0112079a':
  matroskadec: return meaningful errors in matroska_decode_buffer
  matroskadec: fix incorrect unsigned->signed conversion

Conflicts:
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
lavfi/select: make lavc dependency optional.
flashsv2enc: fix prev-Z-prime encoding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
flashsv2enc: Replace a VLA with a heap alloc

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
flashv2enc: reallocate not only on block count changes but on dimension changes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
flashsv2enc: move blockbuffer realloc to reconfigure_at_keyframe()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
gitignore: add Win32 library suffixes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
WMAL cosmetics: fix indentation

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
wmall: fix reconstructing audio with uncoded channels
snowdsp: explicitily state instruction size.

Fixes a compile error with clang at -O0.
vp8: update frame size changes on thread context switches.

This properly synchronizes frame size changes between threads if
subsequent threads abort decoding before frame size is initialized, i.e.
it prevents the thread after that from ping-ponging back to the original
value.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
configure: remove malloc_aligned.

It was to signal that allocations are 16-byte aligned, but AVX requires
32-byte alignment, thus the check is no longer useful (and causes
crashes).
tta: prevents overflows for 32bit integers in header.

This prevents sample_rate/data_length from going negative, which
caused various crashes and undefined behaviour further down.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
h264: additional protection against unsupported size/bitdepth changes.

Fixes crashes in codepaths not covered by original checks.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
h263: more strictly forbid frame size changes with frame-mt.

Prevents crashes because the old check was incomplete.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
ituh263dec: Implement enough of Annex O (scalability) to fix a FPE.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
jpeg: handle progressive in second field of interlaced.

Progressive data is allocated later in decode_sof(), not allocating
that data leads to NULL dereferences.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
motionpixels: Clip YUV values after applying a gradient.

Prevents illegal reads on truncated and malformed input.

CC: libav-stable@libav.org
mpegts: Some additional HDMV types and reg descriptors for mpegts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Add SMPTE240M transfer characteristics flag.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
mpeg12: fixed parsing in some mpeg2 streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
lavc: implement accessors for some AVFrame fields.

Compared to av_opt_ptr, accessors bring:

- better performance (negligible);
- compile-time type check;
- link-time existence check
  (or at worst, a dynamic linker error instead of a NULL dereference).
ffmpeg: use AVFrame accessor.
ffplay: use AVFrame accessor.
JACOsub demuxer, decoder and muxer.
doc: fix API examples references.
MDL-33598 Messaging: students can change their assignment notification preferences
properly cleaned up .travis.yml
Merge remote-tracking branch 'Pulse/cec-frodo-pr' into XBMC_Main

Conflicts:
	language/Dutch/strings.xml
	language/English/strings.xml
	lib/libcec/Makefile
	project/BuildDependencies/scripts/libcec_d.txt
	system/peripherals.xml
	tools/darwin/depends/libcec/Makefile
	xbmc/peripherals/devices/PeripheralCecAdapter.cpp
	xbmc/peripherals/devices/PeripheralCecAdapter.h
Implement CTCP action & QUIT, and move all configuration to main.lua.
fixed some typo
added the section for rakefile
Filters and files added.
Improved description text.
* Fixed font rendering being incorrect
Made Sprite2D's not use TexturedQuad2D. Now you can specify a color
Made setupGL(int, int) reset the viewport
init
Add model classes
added Hibernate hbm files
add Hibernate hbm files
Add spring files
fix spring configuration
TestSpringContext
1. add proxool connectio pool.
2. add spring support and spring remote in pom file.
3. move test file.
partly implement deliver DCT
adjust project structure
deliver dct passed
The dct file parse implemented.
Next step is saving the Dictionary obj to DB.
for interface change
add proxool.properties
Interface change: split deliverDCT() into two methods.
Add files in /app/hg/public/dms/
move .project out of repository
Merge
preview and import DCT done.
Merge
Slight improvement
Added lower standard derivation bound

sigma_min = sigma_init / 2
Dialog um ein neues Passwort anzufordern.
Dialog um zugesendeten Schlüssel zu verwenden um ein neues Passwort
anzugeben.
Refactor
Refactoring MVC and creating test bed
prep abstraction
AppView component with List, Grid, Guide, Video composites.
interrupt: getting new entity.db
Made the readme more readble
kludgy use of warmups to disable cross-world warps
1.x related fixes
aktuelle Stadn funktioniert nicht, QObject Slot Signal probleme
UP-3461:  Add a missing null check to prevent error generating a pathref when the specified noderef no longer exists in the origin fragment
Added vagrant and puppet configuration to make cross collaboration easier by automating the environment setup.
Add port to absolute path if it is not 80 or 443.
sync model with code
fix loading module libraries
uncommen adding libs
Restored UnrestricetedClosures class generation for the runtime, reducing runtime model's size
Merge remote branch 'origin/fisakov/closures'
Added base files such as the css and js cores.
[add] convert: converting string into float and double
Add contact + contribution information
Ignore .vim/.netrwhist.
fixed multimedia video tag link
Changed to open Weather.ini variant of Weather Sidebar skin.
generating stubs for calling C++ methods from OCaml
Sending C++ object as parameter of method too
Work on devserver
install leaflet
solo esta agregando un producto en la estructura final
Shorten up some of the descriptions so they fit on one line.
Conserve units on addition and subtraction if units of x and y are same.
[Issue #8] Nothing to say
Fix memory leak in Makefile generator.

This was introduced by 5d885db416a.
Add missing this->.
Merge topic 'ninja-fix-macosx' into next

1fc8df9 Add missing this->.
7a3ecf5 Fix memory leak in Makefile generator.
Renaming readme and removing local settings file
Updating readme file
iss763 claimed and fixed for issues in journal
iss549 lock block lists for external changes on drag
stub out fetch demo utility
Clearify for idiots.
project: Use $ENV to set dev environment
project: Create project path if it doesn't exist
first commit
Add project source code
Remove Shortlist.txt after adding all tasks to Github issues

Signed-off-by: Abdelrahman Elogeel <zikas_zak@hotmail.com>
touch README

Signed-off-by: Abdelrahman Elogeel <zikas_zak@hotmail.com>
Add project license

Signed-off-by: Abdelrahman Elogeel <zikas_zak@hotmail.com>
change readme file
Merge pull request #12 from MHesham/master

Change README
Add *.qrc files

Signed-off-by: Muhamad Lotfy <mhesham.fcis@gmail.com>
Merge pull request #13 from MHesham/master

Change ;gitignore
Ignore more files
- Ignore BWAPI library include/source files from IStrategizer folder
- Ignore serialization TypeInfo folder from IStrategizer folder
- Ignore QT GeneratedFiles folder

Signed-off-by: Muhamad Lotfy <mhesham.fcis@gmail.com>
Update gitignore

Signed-off-by: Muhamad Lotfy <mhesham.fcis@gmail.com>
Change gitignore and IStrategizer project build events

Signed-off-by: Muhamad Lotfy <mhesham.fcis@gmail.com>
Move exclusions to the end of the .gitignore folder
Change .gitignore exclusion list and remove auto-generated files

Signed-off-by: Muhamad Lotfy <mhesham.fcis@gmail.com>
Add more exclusions, and change projects build settings
- Fix .gitignore exclusions
- Change IStrategizer and StarCraftModel output dirs

Signed-off-by: Muhamad Lotfy <mhesham.fcis@gmail.com>
Change .gitignore exclusions and IdLookup.txt version
Change CaseVisualizer.vcproj settings
Merge pull request #15 from MHesham/master

Configure project repo
Split tools in separate projects

Signed-off-by: Muhamad Lotfy <mhesham.fcis@gmail.com>
Update project config
Merge pull request #16 from MHesham/master

Split tools project from IStrategizer
Added Aranea, Meenah, UU and uu to the character selection. #5
AddSong virker!
init
is this what we're supposed to do?
detect when using LAPACK 3.2.1 and only enable workaround in that case. Fix #335
some tests added to solvers. The tied version of svd still does not compile
Cmakelists of tie
warning fix in round tests
Fix for some types of boots
Merge remote branch 'jhooks/clothingarmor'

Conflicts:
	apps/openmw/mwrender/npcanimation.cpp
building & packaging improvements for OS X
another fix
Khajiit male foot fix
Merge remote branch 'jhooks/clothingarmor'
Merge branch 'master' of git://github.com/zinnschlag/openmw into itemstacking
no virtual templates please
message
const
Some improvments for windows builds and installer
removing some cout spam
removing more cout spam
removing even more cout spam (thanks to scrawl for finding this one)
Merge branch 'master' of git://github.com/zinnschlag/openmw into itemstacking
a few changes
some test with rest
code an geänderte message definition anpassen
Added shared next support
Now possible to produce other things than archers
Fix setting of values to Artwork property.

This makes the Artwork property derived from a MutableString rather than
a unicode type, allowing the setting of values to work properly, rather
than merely by chance, and correcting an issue where importMetadata
would not apply a coverart value to Video Library entries.
(cherry picked from commit e4b46f0cdc1a18ee5dca94e29229531d928a6dc1)
Remove MythGame's MAWS grabber.

Remove MythGame's MAWS grabber since this metadata source has been
dead for some time and the possibility of it ever coming back
appear to be slim and the possibily of it using the same API are
nonexistent.
modified some changes from last version
Add SQL Express install config
Add sql express installer script
Update client setup docs
Update master
Merge pull request #416 from Araxes/patch-38

Tradotto Completamente
Tradotto da WonderIbra
Corretto bug!
a zlib implementation
Added mod_rewrite functionality to bottle

Added code to mimic Apache's mod_rewrite:
URLs are processed by a set of regular expressions _before_ they are
processed by the routing system.
A set of examles can be found at the bottom of the code I added.

PS: These are my first experiences with python, be nice :)
Vacuum-IM: update to 1.2.0
Fixed quotes url

Signed-off-by: Norbo11 <norbo11@googlemail.com>
Updated the graphic part of the Pokemon's battle system.
[opam-mk-repo] regenerate index.tar.gz in case it does not exists
[update] do not delete urls.txt on update
Added commenting and an example
Fixed a typo in the Object Dock.
add Required field to PlayerReference
propagate Required flag to Slot
refuse to start the game unless required slots are full.
build sc-hsm-tool: link with OpenSSL libs
libopensc iso7816: retry SELECT with FCI if SELECT without FCI fails

t457 (https://www.opensc-project.org/opensc/ticket/457)
For some cards that currently use the common iso-7816 operations
only SELECT with return of FCI/FCP can be applied.

In iso-7816 'select-file' handle, if 'SELECT without FCI' fails with error code 6A86,
then retry 'SELECT with FCI'. Other error code can be added.

Sorry for the 'coding style' noise.
libopensc: check data returned by 'read-public-key'

fix error message
fix #320 reverse engineering : select tablename can returns quoted name on mssql
Preparing the 1.6.5 release
Updated CHANGELOG
Bumped version to 1.6.6-dev
cs corrections
Merge pull request #326 from krichprollsch/fix-reverse-mssql-quote

fix #320 reverse engineering : select tablename can returns quoted name ...
create version when deleting many-to-many refs
Updated the composer.json file
Added branch alias to composer.json
Added a way to autoload Phing classes using composer
Added travis-ci file
Updated gitignore
[Tests] [Fixtures] Fixed default database settings
Fixed travis-ci setup
Added bootstrap.php file for phpunit
[Tests] Fixed db settings
Fixed license, added a README
Add: support for EXPLAIN queries in postgres
Merge pull request #332 from K-Phoen/feature-explain-postgres

Add: support for EXPLAIN queries in postgres
[composer] Used phing/phing 2.4.12
Report outline modif
Use handlers as common way to manage bidirectional pipes (for server and client)
Ugly way to sent an email until i find a good secure html way
seclv
Deleted 1 script and modified the other

Deleted DimProduct Script and modified DimCustomer script
inline structureRule
applyRuleSimpleType -> ruleSimpleType
Removing Python files
Icon to be
Removing old pulse-test

The old eqc pulse property does not work with the
new pulse/rebar.config.
Major refactoring of UI logic

- Client.js now only contains pure js.
- Client.js is object oriented (Singleton)
- Client.js contains no UI code.
- The word "Skill" has been replaced with the "Role" in some parts of the code.
update lra 2012
Moved social sharers to the top navbar
Enviadas algumas otimizações
Corrigido warning durante compilação em linux
Mapas da Renovação não são mais acessados no @go da Pré-Renovação
Reorganizado e removidos arquivos da renovação de npc/pre-re/
Adicionado controle de map_index.txt por diretório na database
Corrigido pequeno problema em help.txt
Correção de aviso de monstros não existentes em mapas que não deveriam existir no pre-re.
Adicionada quest dos Homunculus S
Adicionado novo comando de script para trocar Homunculos por Homunculus S
Atualizada homun_exp.txt para suportar até 150 leveis
Alterado import-tmpl para import
Corrigidos alguns erros de diretórios no caso do emulador em Renovação
Adicionados comandos custons do Cronus-Emulator:
show, setjob, digit, additem, additem2, callcashshop
Como comentado por Roberto Lima, não é necessária a importação de arquivos durante a compilação, uma vez que eles já existem no emulador e podem ser recriados a qualquer momento, caso sejam excluidos.
Adicionada função getmapmobs para definir quantos monstros tem por mapa
Correção do código da função getmapmobs
Adicionada mensagem de compilação finalizada com sucesso para usuários que ainda tem dúvidas
Corrigido funcionamento de armadilhas
Corrigido funcionamento de algumas habilidades
adding loacle
RAXAJSS-481 Removed fields from Illness page of Registration
code refactoring in Main controller of Registration
Merge branch 'master' of git://github.com/Raxa/Raxa-JSS
Merge branch 'master' of git://github.com/Raxa/Raxa-JSS

Conflicts:
	src/registrationextjs4/app/controller/Main.js
Conflict resolved in Registrationexjs4
Conflict resolved in outpatient
reverted changes in Main.js controller of RegExtjs4
Merge pull request #218 from madanpiyush/master

Fixed conflict in opd & error in registration
small functions
0.1.0
Se solucionan varios errores.
当以public为root文件夹时适用
Update README.md

I was being stupid and forgot to update github file paths. Done now.
Adicionados arquivos referenciados no commit anterior, porém não versionados.
Fix generic role to user unless sysadmin
username always build a link
Forums show their staff (admin/mod)
1110 Thread
levels and default game states
Follow mixin
Debug en js à propos de l'edit enlevé.
Add test for srun --mpi=list option
BGQ - Add 64 tasks per node as a valid option for srun when used with
overcommit.
Increase sbcast credential cache from 64 to 256 entries
Merge branch 'slurm-2.4'
More updates to SPANK plugin

You'll find this as commit 2079c03f58 to the chaos/slurm 2.3.3.chaos branch on March 7.  This is against SchedMD's master branch:
Minor test mods for old RedHat distro
Finally, some stuff from Orins point of view. I thought this was really good actually. But maybe thats the wine talking
Drupal: move back default configuration to default site
Drop python definition from Lamp stack
Add warning for old lamp stack.

Support of lampconfigure should be added in new stack, then this one can be safely dropped
frontend: send ipv4 + ipv6 connection in slaves.

Useful if owner of slave defined a custom domain and has to define by himself DNS entry.
Hint in request.py in case of error
Update buildout version to 1.6.0-slapos-006
Pin version of eggs in LAMP stack
request.py: Fix parse error (beginner mistake) in status string
Merge branch 'drupal'

Conflicts:
	slapos/recipe/request.py
Release slapos.cookbook-0.54.1
Advertise development of new versions
PostgreSQL (from training in April 2012)

Signed-off-by: Cédric de Saint Martin <cedric.dsm@tiolive.com>
Fix mariadb request
added recipe and software release for postgres
don't do anything if data directory exists; fix ipv6 url
replaced @ in uri
'exec' the postgres command to control it from supervisor
remark
preliminary lapp and maarch support
reference correct part; added md5sum
added pear module: MIME_Type
substituted pdo with plain pgsql
typo 0ff -> Off
pear module: CLITools
create the superuser, set his password, provide a php.ini
create db and user in separate steps
updated postgres to 9.1.6 - fixes corruption issue
removed mysql from php compilation
maarch configuration recipe
only listen to ipv6 address, and unix socket
fix for pear modules
frontend: better handling of slave errors

Slave errors must NOT stop processing of other slaves
COMP: Ensure CMake options can be overwritten during initial configuration

The file "SlicerOverwriteDefaultOptions.cmake" was included after defining
dependent options. It means that CMake option depending on
overwritten value were properly set only after a second configuration.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@20661 3bd1e089-480b-0410-8dfb-8563597acbee
COMP: Explicitly set all DCMTK related options in CTK external project

Doing so ensure that the CTK project will be properly reconfigured if the
option Slicer_BUILD_DICOM_SUPPORT is toggled.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@20662 3bd1e089-480b-0410-8dfb-8563597acbee
COMP: Set DCMTK as a depencency of CTK external project

git-svn-id: http://svn.slicer.org/Slicer4/trunk@20663 3bd1e089-480b-0410-8dfb-8563597acbee
COMP: Honor option Slicer_BUILD_DICOM_SUPPORT by conditionally building DCMTK

git-svn-id: http://svn.slicer.org/Slicer4/trunk@20664 3bd1e089-480b-0410-8dfb-8563597acbee
STYLE: Add abstract class for all view nodes

vtkMRMLViewNode, vbtkMRMLSliceNode and vtkMRMLChartViewNode share some
common properties: they are views of a layout.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21034 3bd1e089-480b-0410-8dfb-8563597acbee
Resolves a dozen of bogus docblocks in the MVC component
Converted Zend\Acl to use relative namespaces in docblocks
Ensure that we determine the requestUri after we have determined the hostname and port
A few more tests for serverHostnameProvider()
MvcEvent target should be changed back to the application on finish
remove $_table property, and change references to $table, the property defined in Zend\Server\AbstractServer
OpenId redirect method fix - Zend\Http\Response renderResponseLine (which doesn't exist anymore) replaced by renderStatusLine
update copyright year
Added unittest
Merge branch 'hotfix/ZF2-209' of https://github.com/mpinkston/zf2 into hotfix/zf2-209
[ZF2-209] Updated tests to reflect constant rename

- s/ERROR_CONTROLLER_NOT_FOUND/ERROR_ROUTER_NO_MATCH/
Merge branch 'cldr-cache-language' of https://github.com/umpirsky/zf2 into hotfix/cldr-display-territory
Merge branch 'http-genericmultiheader-duplication' of https://github.com/elazar/zf2 into feature/http-multi-header-dedup
Merge branch 'preg-explode-madness' of https://github.com/elazar/zf2 into hotfix/http-header-improvements
Merge branch 'master' of https://github.com/wdalmut/zf2 into feature/docs-mvc-route-it
Merge branch 'feature/navigation-refactor' of https://github.com/froschdesign/zf2 into hotfix/navigation-module_remove
Merge branch 'hotfix/ZF2-169' of https://github.com/adamlundrigan/zf2 into hotfix/zf2-169
Merge branch 'hotfix/text' of https://github.com/sasezaki/zf2 into hotfix/zf-11792
[ZF-11792] CS cleanup

- Added docblocks to InvalidArguementException class
- Removed import of Exception namespace; unnecessary, as it's a
  subnamespace
- Practiced object calisthenics in MultiByte::wordWrap(), and got rid of
  all elseif/else statements
Merge branch 'hotfix/classgenerator-isabstract' of https://github.com/sasezaki/zf2 into hotfix/generator-abstract-return
build menu now does everything besides building
Merge github.com:SoobNauce/CWE
made work with rc3
Don't ignore SIGCHLD on fork; fixes git

Doing something like git status was returning an error like:

	$ git status
	error: waitpid for status failed: No child processes
	fatal: git status --porcelain failed

Leaving the handler alone solves the issue.
Correct error message in exec_job().
Prep for tagging v1.2
fix to RNScreen, removed unused idInScreen variable
Moved the 'how to use' section on top of the document and added more detailed tutorial how to get started with rapanui
fixed typos from License text
Merge pull request #86 from PunchWolf/master

Small modifications to documentation and config, thanks to niom
fix to RNButtons:setAlpha()
Merge branch 'rapanuidev' of https://github.com/ymobe/rapanui into rapanuidev
Added some comments. v2
Added option to /butcher to kill town NPCS
Handling wrong PINs
Miaox - replace depreced func
how's about this? awesome System.out messages for demo goodness. Will have to be changed when we are actually going to do stuff with JTorX though...
Merge branch 'master' of github.com:Thiez/VE-2012
Merge pull request #63 from Tmpn/master

API: added title to comments/ratings, WEB: deleted line that messed up api-key-generation
reCaptcha implemented
Introduction text centered
Made two new page placeholders
Made a nice spacer between the first and the second page.
Suppression
Merge branch 'master' of https://github.com/Toshy62/zNews

Conflicts:
	zNews.pro.user
Prise en charge de l'UTF-8
Fixed Gate.Middleware.Tests.
Auto doc generation (Valadoc). Enhances: #5

 * Optional target "doc". Build with `make doc` and install normally.
seeding places classes from yaml
Merge pull request #2 from Versum/nikolai-branch

seeding places classes from yaml
place classes
viruses, dives, essences...
virus fixes
five engine
some virus skills
dive engine
tests and some skills
dive engine refactoring
profiles
migrate
Merge branch 'master' of github.com:Versum/portal

Conflicts:
	db/schema.rb
merge
STI profiles
STI + profile migrate
STI
Captains are now chosen randomly when a game with captains is started.
Serialize the truncation handle.
Primary doesn't require repair log

... and can't truncate it (easily) if it has one.
update the 3rd party readme with JSCH license
@Explain related stuff added in ClientInterface and systemProcedureCatalog
@Expalin works for AdHoc query, only have single partition plan for the moment, need to get m-partition work as well
batch explain AdHoc query SP MP both works properly now
explainProc works properly, is this done?
ant check pass now
auto format trial
Revert "auto format trial"

This reverts commit 71a7b0f191e6debe66695efcca9a30b369d6d8d5.
get SQLCommand to previous format
modified fragments getter because interface has been changed
merged with upstream voltdb
fixed a bug, add code in asyncCompilerAgent to compile plan for explainAdhocPlannerWork and retrun explainPlannedStmtBatch
try to merge with origin planner
useless changes from eclipse removed, finally
delete an empty line
merged with uptodate plannerTester
Merge branch 'master' of https://github.com/VoltDB/voltdb into explainPlan
add a throw in a method in explainPlannedStmtBatch
Fix for ENG-3509. The executable sqlcmd is not under ./bin, instead of ./tools/sqlcmd.
Merge branch 'planner' of https://github.com/zli236/voltdb into explainPlan

Conflicts:
	src/frontend/org/voltdb/ClientInterface.java
add suite test for explain command
Subclass ProcedureTask to special Sp and Mp work.
Translation into Polish
Minor style changes.
update Greek translation
Optimize images with PNGGauntlet

The decrease is around 32KB
basic viewing of info_values on user show page
FFT ready
Oh, duh, wait, it's only a friendly status message for Git.
update gitignore
Add stockitem attributes

Added info and schuif to table.
Add info and schuif to new stockitem dialog box
Increase stats-name length to 255
Logging every request a bit more detailed by creating a counter on the fly with topic_id+post_id+user_id in the key name.
Refactored topiclist sql into TopicListService class
Pass archive flag through to TOpicListService
Always show the number of unread topics of the inbox, not the currently shown topicList
Merge branch 'feature/pagination' into develop
Merge branch 'develop'
Several small fixes.
Added validator to news for start and end date.
Renamed "Retired staff" to "Former members".
Added displayed consultants to thesis details.
Phone in a staff list now on multiple lines.
Moved config
Removed 1 deploy type
New type of deploy: all in one place
Changed default deploy type
Added local version of 'var' dir for app data
Updated ignore after new adding of new dir
Updates in script that generates config

Its not a secret. Here they are:
 * we look for example of settings in current dir
 * all occurenses of PORTDIR are replaced
 * all occurenses of APPROOT are replaced
 * added explanation on 'emerge --info'
 * clarified a bit logic in 'OS detection' *if*
Changed dir where config is looked up
chapter A
strict field is deprecated
fix: printing blocks' output
fix: `tpl.check` without `strict` templates and more detailed reporting
fix: code tags inside pre tags
Merge pull request #412 from aabes/pull-req-master-2ca02f7a7c

Pull in (just) nagios [1/4]
Merge pull request #413 from aabes/pull-req-cloudera-os-build-a281327ad6

Pull in (just) nagios [2/4]
Merge branch 'master' into cloudera-os-build
Do not try to update the cache by default.
Add slightly more helpful error when we need to update the cache.
Make build_crowbar always try to sync the build cache branches.
Fix up pull request scrubbing.
Don\'t actually push anything when running in debugging mode.
Add 32bit libraries for the DUP images
Merge branch 'master' into cloudera-os-build
Merge branch 'master' into cloudera-os-build
Merge remote-tracking branch 'dell/cloudera-os-build' into cloudera-os-build
Merge remote-tracking branch 'dell/master'
Merge branch 'master' into cloudera-os-build
Merge remote-tracking branch 'dell/cloudera-os-build' into cloudera-os-build
Merge remote-tracking branch 'dell/master'
Merge branch 'master' into cloudera-os-build
Merge pull request #416 from galthaus/pull-req-master-1255e7a76e

Update Sledgehammer to have i686 libraries needed for DUPs. [1/4]
Merge pull request #417 from galthaus/pull-req-cloudera-os-build-2c154ce8fc

Update Sledgehammer to have i686 libraries needed for DUPs. [2/4]
Merge pull request #420 from VictorLowther/pull-req-master-04dad819a2

Pull in several correctness fixes for the dev tool [1/4]
After fetching, prune any deleted remote-tracking branches.

-p, --prune
  After fetching, remove any remote-tracking branches which no longer
  exist on the remote.
Pruning can be disabled by setting git-up.fetch.prune to false
Don't prune if git doesn't support it
Document git-up.fetch.prune
Merge branch 'prune'
Version bump to 0.5.3
[maven-release-plugin] prepare release porpoise-mapper-0.3.0
ck_bag: Fix overallocation bug.
Initialize bag->n_blocks to fix overallocation bug
during initial ck_bag_put_spmc.
blah2
hmm
blah
blah3
Merge branch 'stable' of github.com:abiquo/abiquo into stable
ABICLOUDPREMIUM-3568 getDatacenterRepository not always include repo fs usage.FIXED
merges ABICLOUDPREMIUM-3568-repo-not-always-refresh
(#15001) ifconfig regex will optionally match 'addr:'

Newer versions of ifconfig, as found in Fedora 17, have changed the
output format of ifconfig. This change removed the 'addr:' string which
prevents the regex from matching. This patch makes matching 'addr:'
optional.
Test data for net-tools 1.60
(#15001) Add spec examples for ipaddress fact

Without this patch we don't have an example behaviors for the ipaddress
fact.  This patch addresses the problem by adding two examples for the
facts parsing the output of ifconfig.  These examples slightly refactor
the ipaddress fact confined to Linux in order to take advantage of the
stubbed method returning the output of the ifconfig command.

Fixture data for ifconfig output is included for Ubuntu 12.04 and Fedora
17.  The notable difference with Fedora 17 is that Net Tools 1.60
removes the "addr" substring from the interface description.
Merge branch 'fix/1.6.x/15001_ifconfig_format_change' into 1.6.x

* fix/1.6.x/15001_ifconfig_format_change:
  (#15001) Add spec examples for ipaddress fact
  Test data for net-tools 1.60
  (#15001) ifconfig regex will optionally match 'addr:'
Merge branch '1.6.x' into 1.7.x

* 1.6.x:
  (#15001) Add spec examples for ipaddress fact
  Test data for net-tools 1.60
  (#15001) ifconfig regex will optionally match 'addr:'
(#15001) Use the internal loader to load ipaddress

Without this patch the fix to the ipaddress fact fails our spec tests
because the method Facter.collection.internal_loader.load should be used
to load a fact.  This patch uses the correct method call and resolves
the spec failure.
Merge branch '1.7.x' into 2.x

* 1.7.x:
  (#15001) Use the internal loader to load ipaddress
  (#15001) Add spec examples for ipaddress fact
  Test data for net-tools 1.60
  (#15001) ifconfig regex will optionally match 'addr:'
Merge branch '2.x'

* 2.x:
  (#15001) Use the internal loader to load ipaddress
  (#15001) Add spec examples for ipaddress fact
  Test data for net-tools 1.60
  (#15001) ifconfig regex will optionally match 'addr:'
Backend: Fixed failing unit tests due to Client/Server protocol change.
Lists of LSFRS and phrases are now stored in an array instead of dictionary.
removed spaces between bars
Merge branch 'master' of github.com:absperf/hubot
Fix user int copy fault at process end
io giusto per il judge
switch to application.css
Upgrade to CodeIgniter 2.1.1
Update sessions database to support IPv6
Update latest DB schema
Good grief, this must be an absolute path.
Doc fixes and tidying.
First pass at a multitouch API.
Dummy stubs for environments that don't support touch or mouse.

There doesn't seem to be a way to accurately detect touch/mouse support
in HTML, so supported will always equal true there.

Closes #27.
added edit distance algorithm
fixed flipping bug
Merge branch 'chris' of github.com:afarrell/smak into danica
fully merged
added start/end constraints
Merge branch 'danica' of github.com:afarrell/smak into chris
constrain bounds
Merge branch 'chris' of github.com:afarrell/smak into danica

Conflicts:
	edit_distance.js
	javascript/edit_distance.js
fixed broken stuff due to auto schedule button
Added email field to facebook backend.
Hyphened Email to E-mail.
Removed Administration links.
Removed sqlite database engine, removed ADMIN fields.
mongoengine User class inheritance.
Merge branch 'master' into issue-61_ver-2

Conflicts:
	piplmesh/urls.py
	requirements.txt
RegistrationForm is no longer dependant on django relational database.
Bluetooth: Don't increment twice in eir_has_data_type()

The parsed variable is already incremented inside the for-loop so there
no need to increment it again (not to mention that the code was
incrementing it the wrong amount).

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo@padovan.org>
Bluetooth: Check for minimum data length in eir_has_data_type()

If passed 0 as data_length the (parsed < data_length - 1) test will be
true and cause a buffer overflow. In practice we need at least two bytes
for the element length and type so add a test for it to the very
beginning of the function.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo@padovan.org>
Bluetooth: Update management interface revision

For each kernel release where commands or events are added to the
management interface, the revision field should be increment by one.

The increment should only happen once per kernel release and not
for every command/event that gets added. The revision value is for
informational purposes only, but this simple policy would make any
future debugging a lot simple.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Bluetooth: Add address type to struct sockaddr_l2

This patch adds the address type info to struct sockaddr_l2 so
user-space can inform the remote device address type required
to establish a LE connection.

Soon, instead of looking the advertising cache up to discover the
address type, we'll use this address type info to establish LE
connections.

Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Bluetooth: Add dst_type parameter to hci_connect

This patch adds the dst_type parameter to hci_connect. This way, we
use the address type information from upper layer instead of searching
it on the advertising cache.

The dst_type parameter is ignored for BR/EDR connection establishment.

Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Bluetooth: Use address type info from User-space

In order to establish a LE connection we need the address type
information. User-space already pass this information to kernel
through struct sockaddr_l2.

This patch adds the dst_type parameter to l2cap_chan_connect so we
are able to pass the address type info from user-space down to
hci_conn layer.

Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
pause mode, shot debug cleans up after itself
[Dev] Added the possibility to specify an event type filter when listing all the queue objects in a JSON-format.
[Git] Ignore the appserver/ directory.
removed prose
API key update
elmah added, db-config tweaked for github publish
HW1 finished.
nlp na finishu
Add "autocrlf = input".
Add global git ignore file.
More digging into structure
webserver: return full JSON-RPC API definition when requesting /jsonrpc with HTTP GET
[cosmetics] fix some warnings
CGUIWindowSlideShow: fix possibly bad zoom value
[rbp] fixed. compile fix after PVR merge. proper PVR in omxplayer will follow in the next couple of days.
[osx] fix command-line make, osx does not use AESinkFactory or AESinkNULL
[droid] disable Linux system events

Temp until Linux Events is used as a proper fallback.
pvr: use lowercase url for error message
Merge pull request #1367 from Montellese/jsonrpc_get_output

webserver: return full JSON-RPC API definition when requesting /jsonrpc with HTTP GET
fixed: typos
slideshow: fix snap back feature for rotated images
[pvr] parse/split input streams for extra data
Merge pull request #1374 from FernetMenta/chdfix

[pvr] parse/split input streams for extra data
[osx] use llvm instead of clang in xcode project to match depends usage
don't add WINDOW_DIALOG_OSD_TELETEXT dialog twice
update comments with current window ids
fixed: PulseAE would not compile

- CPulseAE::Resume() had wrong class identifier
- the pure virtual IAEStream::IsDrained() had no implementation in
  PulseAEStream

thanks to s7mx1, closes github-issue #1376
Merge pull request #1230 from alcoheca/upgrade-platinum

[gsoc] [UPnP] Upgrade Platinum
[UPnP] move UPNP code to it's own namespace
[UPnP] changed: make UPnP optional (enabled by default), fix some missing #ifdef HAS_UPNP guards
[UPnP] split off UPnPServer to separate file. move some static class methods to
helpers via internal header
[PropertyScratchpad] Improved the Javadoc
[model] Removed all support for the "link" pseudo-type identifier

Big Red has never intentionally produced this unsafe identifier
[ModelObjectValidator] Preserve the value of an argument variable

This makes the tryValidateChange(IChange) method much more debug-friendly
[ModelPropertySource] Fixed a casting bug triggered by colour changes

Eclipse passes RGB objects to this method, not Colours
[XMLSaver] Added some safety checks in the applyAttributes method

applyAttributes will now do nothing when confronted with null attribute
names or values
[ReactionRuleXMLLoader, ReactionRuleXMLSaver] Don't attempt to save or load
null Colours
3.1.0, Update README
Renombre de Derivation por Verification.
Fix regression causing skirt to be printed at Z = 0 after a recent commit
specify correct branch in makefile
remove makefile after building
fixed get input with default values in shellscript
new file:   Google_calender.rb
	modified:   MaidCal.rb
	modified:   MaidMail.rb
	modified:   README.md
	modified:   config.rb
	modified:   maid-calender.rb
	modified:   maid-tyan.rb
	modified:   search_today.rb
	new file:   weather.rb
异常信息加强 和 bug fix DUBBO-510 Provider调用有Error时，Provider端没有日志报警
Tags breadcrumbs
Submit a review fix
Request a quote
Layout tuning
Layout tuning
basic validation for required config
reorganised classes + specs
added service classes
added config and token classes
Added an explicit type case (this might be necessary for Postgres on Heroku)
Merge branch 'master' of github.com:alltom/hubbub
added r command for easy testing ruby files
switched from Textmate to Sublime Text 2
moving monographie to T100 project
updated import process to not insert duplicate games, added logoff link, updated preferred games template
Archivos .DS_Store agregados al .gitignore
Updaing README.md...
3535332 : Sesame RIO integration module
3535332 : Record Rio patch contract variations

OWLRDFConsumer.isUnrecognisedRdfTypeAxiom
OWLRDFConsumer.addUnrecognisedRdfTypeAxiom
3535332 : SesameTools RDF/JSON integration
3535332 : Test breakages
switch to new groupId com.github.ansell.pellet
mostly functional, classifying
zsh: Add "classify" to "ls" alias.
Thank pyr and dch
Source code highlighter interface [#130]
Update Test title.txt
replaced culture with language, add macros

Language seems more suitable to me.
rename some variables
new api: get_string, get_strlen, default_language
update on api
add pcr_get_codepage
replace set_string, refactor some code
small rf
Update CodeMirror to version 2.31.

http://code.google.com/p/esprima/issues/detail?id=300
Location for each comment should honor the options.

'range' and 'loc' in the parsing options will define whether the
index-based and line/column-based location info for each comment will be
available or not. This is done for consistency.

http://code.google.com/p/esprima/issues/detail?id=233
An example to find out token distribution.

http://code.google.com/p/esprima/issues/detail?id=301
Update CodeMirror to version 2.32.

According to CodeMirror web site:

23-07-2012: Version 2.32:
Emergency fix for a bug where an editor with line wrapping on IE will
break when there is no scrollbar.

http://code.google.com/p/esprima/issues/detail?id=300
Supports AMD.

As recommended by James Burke, using UMD pattern
(https://github.com/umdjs/umd) permits using Esprima also with an AMD
loader such as RequireJS.

A new manual test has been added to verify that this AMD loading works.

http://code.google.com/p/esprima/issues/detail?id=291
Merge branch 'master' into gh-pages
Remove the test which will be invalid in ES6.

http://code.google.com/p/esprima/issues/detail?id=334
Added a default data.pkl
definitive scenes
catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead
converting some tests to assert_raises, and DRY'ing retrieve_variable changes
be sure to currectly fetch PK name from MySQL even if the PK has some custom option
Merge pull request #5900 from amatsuda/ar_mysql_pk_with_using_option

current MySQL driver fails to fetch PK name when the PK has USING option
Freeze the middleware stack after it's built

So apps that accidentally add middlewares later aren't unwittingly dumping them in a black hole.

Closes #5911
Merge pull request #5865 from tiegz/minor_fixes

Catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead
Deprecate `:disable_with` in favor of `'data-disable-with'` option for `button_to` and `submit_tag` helpers.
Fix typo
Deprecate `:disable_with` for `button_tag` too
Backporting some docs on core_ext/hash
Merge pull request #6321 from frodsan/backport_docs

Backporting docs
clean the errors if an object that includes validations errors is duped,for 3-2-stable
It Fixes #5953 in 3-2-stable, it's the same pull request of #6284
Merge pull request #6324 from acapilleri/dup_validation_3_2

Dup validation 3 2
Fix indent from previous merge
add backport for the pull request #6324
Merge pull request #6329 from acapilleri/backport_dup_validation_3_2

Backport dup validation 3 2
Changing the indentation level of the block comment close for SASS

If one wants to use use SASS for application.css.sass the comment block indentation is invalid.
Merge pull request #6340 from bcardarella/patch-3

Changing the indentation level of the block comment close for Sass
Fix CollectionAssociation#replace to return new target (closes #6231)

Conflicts:

	activerecord/test/cases/associations/has_many_associations_test.rb
fix validations docs
Merge pull request #6367 from frodsan/fix_validators_docs

Fix validators docs [3-2-stable]
Deprecate old APIs for highlight, excerpt and word_wrap
Merge pull request #6377 from ihid/depreciate_old_text_helper_apis

Deprecate old APIs for highlight, excerpt and word_wrap
Perf: Don't load the association for #delete_all.

Bug #6289

Conflicts:

	activerecord/test/cases/associations/has_many_associations_test.rb
fix #delete_all with habtm with :delete_sql
Fix HABTM syntax error in Ruby 1.8.x
add terrain.png (+ fetcher)
Adding more binaries
Added removeFollower func.
Merge branch 'master' of https://github.com/RowdyHowell/picnit
Merge branch 'master' of https://github.com/RowdyHowell/picnit
Merge branch 'master' of https://github.com/RowdyHowell/picnit
Merge branch 'master' of https://github.com/RowdyHowell/picnit
Merge branch 'master' of https://github.com/RowdyHowell/picnit
Merge branch 'master' of https://github.com/RowdyHowell/picnit
Merge branch 'master' of https://github.com/RowdyHowell/picnit
Merge branch 'master' of https://github.com/RowdyHowell/picnit
Merge branch 'master' of https://github.com/RowdyHowell/picnit
Merge branch 'master' of https://github.com/RowdyHowell/picnit
Actually return results from search API functions
Added followers and following tab functionality.
Merge branch 'master' of https://github.com/RowdyHowell/picnit
Add getFollowRequests() to member API
Oh, right.
Merge branch 'master' of ssh://github.com/RowdyHowell/picnit
Add getUserTaggedImages(), and getLast variants of it and it's cousin
Fix extra '{'
Make getFavorites() actually return the image content
closed text area
Merge pull request #152 from bdupree/master

closed text area
styled text area in album bar
Merge pull request #153 from bdupree/master

styled album bar text area
Add $fuser_id parameter to getImages() to get user's favorites
Merge branch 'master' of ssh://github.com/RowdyHowell/picnit
Remove old getFavorites() function
PC-MMU
Changes were made by PC-MMU
adding common_da file
[Doc] Add documentation on conception and web services
replaced all hard coded language with language tokjens, and updated language database with 43 new strings
updated parent application example to use mixin pattern
[PVR] Change to make switching channels behave better
Keep rounding as it was, prefer floor to round
Fix schedule spec to run in isolation

Should not depend on ActiveSupport, and module inclusion not working.
Respect time zone info from start_time

Fixes #115
making settings{} a function