labofsahil/github-event-dataset-2012 huggingface dataset:
Changed page title
Merge pull request #118 from carterpage/javadoc

Changed page title.  Cosmetic change.  SELF-MERGING
Deploy to Cloudfoundry when Maven arg -DdeployDemo=true is set
Merge pull request #119 from carterpage/javadoc

[SELF-MERGE] Enabling Cloudfoundry auto-deploy
Merge pull request #114 from cepage/tests

Added ability to disable explicit selectors. Implemented SelectorResolve...
Merge pull request #117 from sduskis/master

Initial checkin of urlrewriter code.  You have to uncomment some lines in springmvc demo's web.xml
Exported JSONassert to a separate package
Moved DynamicPropertyResolver to yoga-core. Added dependency on Spring Core.
Changed default behavior to allow explicit selectors
Merge pull request #120 from cepage/tests

Moved DynamicPropertyResolver to yoga-core
Merge remote-tracking branch 'upstream/master' into jsonassert
Updated RunServer to follow symlinks
Extracted JSONassert.  Now points to jsonassert-0.9 in pom.xml.
Merge pull request #121 from carterpage/jsonassert

Extracted JSONassert.  Now points to jsonassert-0.9 in pom.xml.
Merge remote-tracking branch 'upstream/master' into dataload
Added (but left disabled) loader to initialize larger data sets for testing.  Dataset retrieved via web to limit size of project.
Removed redundant jsonassert ref
Merge pull request #123 from carterpage/dataload

Dataload
adding resteasy urlrewrite capabilities.  Mad the shared UserController tests work
more reorganizing
Spring cleaning, code readability, simplified parsing with a Graph class
Mejoras Actuales:
- Se realizaron modificaciones en las vistas de las gráficas para integrarlas mejor con jquery, además que se arreglaron ciertos errores que ocurrían al abrir algo que no tuviera los métodos de periodic y modalclose.

- Se implementaron las vistas de medidas de centralización, medidas de variabilidad y medidas de forma.
Arreglado algunos problemas de estilos en css
完成加减算法
- Add forgotten Makefile.* for write_obj
- Delete WriteObj2 example
Convert to UNIX EOL
Adding new auto* scripts
fix bugs with cache
Code cleanup abnd bump ion-defs
起動手順などを更新
User.statusの即値を使わない
ログインボタンを大型化
投稿ボタンを小型化
情報boxデザイン
classの命名規則を統一
ユーザの認可/管理者設定操作をアイコンに
Typo修正
save twitter icon in Status
Merge branch 'master' of github.com:shokai/rtbot
broken tooltip
Blog entries.
adding nodeToSymbolTable to symbol table
Merge branch 'master' of github.com:smessing/Hog
working on report.
Merge branch 'master' of github.com:smessing/Hog
working on final report.
starting to add in source code.
working on adding source code files.
workiong on final report.
rename next/prev to right/left in OrderedSet
give a suggestion of how to fix use2to3
permutations: Cycle gets size property and __iter__
permutations: as_list -> list method
BUG: fixed a deadlock in the draw function. Also added some usuful get and set functions
removed some legacy comments
moved destructors to the base, Dataset, class
created some exception classes for the library
added usage of exceptions
converted the last errors to exceptions
xml-hamlet: Adapt specs for hspec 1.0/1.1
Merge pull request #8 from sol/master

Make sure that all tests work with hspec-1.1.0
mayfly blog
add .gitignore
Merge github.com:solos/mayfly

Merge github.com:solos/mayfly
Task #38: Added ability to aggregate features from other modules
Workaround: Re-connect sessions...
better Input class with implicits.  switch Validation for \/

Signed-off-by: Mike O'Connor <stew@vireo.org>
about.html: docs link fixed
add rbx-19mode
bugfix for frame-star stuff of jagat
framestar core divided on simple and OT source files
Renamed changeTexture to swapTexture and changed delete … to setting the variables as undefined instead.
pointing to the heroku link in the readme
fix for angularjs errors
Merge branch 'develop'

* develop:
  fix for angularjs errors
  pointing to the heroku link in the readme
Make sure user owns /usr/local/bin
lxy

change pic
Crashtest for bug 782141 - (CVE-2012-3969) Heap-buffer-overflow in nsSVGFEMorphologyElement::Filter. r=me.
Bug 806422 - Do not cache Complete's across a SafeBrowsing update. r=dcamp
Bug 806422 - Modify and add tests for new Complete caching behavior in protocol 2.3. r=dcamp
Bug 808772 - Adjust Android low-memory platform threshold to 512 MiB. r=blassey
Bug 804738 part 1.  Fix codegen for named operations to be consistent about the naming of the string argument.  r=peterv
Bug 804738 part 2.  Fix codegen for indexed operations to be consistent about the naming of the index argument.  r=peterv
Bug 808728 - Log remote environment vars correctly; r=jmaher
Bug 808725 - Pass -m and -n to xpcshell when running xpcshell-tests-remote; r=jmaher
Bug 807919 - stop invalidating text bounds twice on updates. r=jwatt
bug 803383 - scale quartz surface properly to ensure full-resolution backing store is used when compositing xul:panels. r=smichaud
Bug 718088: offer to re-set keyword.URL if it has a non-default value, r=bz on the docshell parts, r=fryn on the rest, ui-r=limi.
Bug 808876 - Part 0: Only allow the usage of enum classes in gcc 4.5 and newer; r=bzbarsky

Older gccs such as gcc 4.4 cannot handle comparison operators taking
arguments of the enum class type, which would cause valid C++ code
to not compile.  So we should just use our fallback enum class
emulation on those platforms.

--HG--
extra : rebase_source : 3cd2fd2faabc36c767e76442efabf55f8a54c83f
Bug 808876 - Part 1: Implement PannerNode; r=bzbarsky

--HG--
extra : rebase_source : a7b901dcc7758ff9c7a8917a956d0541187fea07
Bug 808483: Fix dependent string assertion; r=luke

Undepended strings can break the assertion in JSDependentString::new_. This
generalizes the assertion to work for all cases.

--HG--
extra : rebase_source : 62b7fa786c6250054092723b92cd97bded92d6b1
Bug 808834 - Fix length check when uninlining new dependent strings; rs=luke

--HG--
extra : rebase_source : 51fde514fd92a5a65b078d4b7dfffe3d9640c751
Bug 805492 - Add some more exact script rooting; r=sfink

The new decompiler is hitting an AssertNoGC() from this.
Bug 808783 - Disable failing Mn tests, r=jgriffin
bug 805760 - update graphite2 lib to commit 51e72e74b9a6. r=jdaggett
Bug 808915: Add EWOULDBLOCK to all the EAGAIN cases r=mcmanus
Bug 807709 - Downloads Panel does not always close when handing off operations to the OS. r=mak.
rewrite hokey (and wrong!) alignment computation to use a dummy struct, more portable
Update mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/RelaxngPattern.cs

- Choice of using the parser for compact syntax or not based on the file extension,
in order to allow mixed grammars (e.g. including RNG from RNC).
- Correction in base URI for compact syntax in order to allow including grammar files located in different directories.
[sgen] Fix use of volatile in the lock free allocator.

Ignorant use of volatile resulted in a bug in the lock free queue, which is used by the lock
free allocator.
Revert SERIAL_COPY_OBJECT_FROM_OBJ as it's only benefit is to avoid a remset check
we can't really avoid. And the simplification for the simple nursery can be done directly
in HANDLE_POINTER.
Use Zoltan's simpler promotion failure check for the simple nursery.
Allow the linker to preserve a whole assembly. Avoid using linkskip (e.g. with linkall) on several projects using the same (non-linkable) assembly
Add support for AxHost.CreateHandle
Call DefWndProc by default in AxHost.WndProc
Call base for Dispose and DestroyHandle
Implement RegistrationServices.GetProgIdForType
Fix NTLM related test failures.

* Provide a more descriptive [Obsolete] message for the legacy API.

* Refuse to send the LM response unless explicitly enabled with
  Type3Message.DefaultAuthLevel.  The LM response is only actually
  checked by old, pre-historic servers and sending it exposes the
  user's password to very weak encryption.

* Fix some problems when encoding / decoding problems in Type2Message.

* Type3Message now encodes host and domain name in a case-sensitive
  way, fixes the tests.
Fix ConfigurationManagerTest for .NET 4.0 and 4.5.

Use a new 'DotNetVersion' property rather than hardcoding 'net_2_0'.
[System.Configuration]: Fix filenames in ExeConfigurationFileMap.
[System.Configuration]: Imlement ConfigurationElement.EvaluationContext.
Merge pull request #508 from alesliehughes/master

More Changes to AxHost to stop Exceptions
Implement .extern class support for forwarded types
Add new test
Avoid an assert in sdb if mono_thread_info_safe_suspend_sync () fails for an attached thread.
[monodoc] Update target
Submodule ikvm reflection
Remove duplicate ikvm modul registration
info
backup
Merge branch 'temp1'
Moved around classes, added Consumer class for clarity.
add jre setup
give terms_gcd deep and clear options.

    Also add note to terms_gcd about clear and add See Also
add note to decompose_powers docstring
gcd_terms: fraction=False does not force a common denominator
give odesimp more preprocessing to make solutions simpler

    terms_gcd, rather than factor_terms, is used because it only
    extracts factors that are actually present in terms, e.g. (1/x + x)
    is not changed to (1 + x**2)/x.
shorten line lengths in test_ode.py to < 80
do not let exp factor out incompletely

If a solution is in the form exp(x)*C1 + exp(2*x)*C2 do not
let it become exp(x)*(C1 + exp(x)*C2).
misc edits after review
Merge pull request #1050 from smichr/ode

Odesimp returns simpler solutions
capture restores stdout even if function func() fails

    Previously, if you made a mistake in the function you passed
    to capture, it would not restore the output to stdout.

    e.g.

>>> capture(pprint(x/y))
x
-
y
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
    File "sympy\utilities\iterables.py", line 461, in capture
        func()
	TypeError: 'NoneType' object is not callable
>>> print 1 # output still captured by StringIO
>>>
Merge pull request #1168 from smichr/capture

capture restores stdout even if function func() fails
[integrals] Fix NotImplementedError from issue 3154.
Merge pull request #1160 from asmeurer/test_args

Add a more helpful error message to the test for all classes in test_args.py
Merge pull request #1170 from ness01/3154

[integrals] Fix NotImplementedError from issue 3154.
Ironsight support

Initially add options to toggle between
iron and normal view.

Reduce recoil when using iron sights by
a constant, for now.

Reduce speed when using iron sights by
a constant, for now.

Do not draw crosshair when activated.

Remove weapon view model physics movements.

Prepare hooks for animation work.
use string instead of t_atom for message/list arguments

message receiving works with modified c code
some architecture rework
got rid of t_atom type

added C code for hook setters and message/list arguments as string
was trying to move hook setter methods to new file z_hookset
Add links to v0.2 post
more logging in add_timeouts
petit changement, mais le code a un pbm anyway
guillemets propres
added server sample
before 92.12
Подключение монго
i.n.i.t
test
d
ddd
tide img
sd
s
d
d
f
d
turn all swtiches on when first run
changed some units of measurement
Added indicator if document is saved or not; proper changing of working directory; HTML rendering improvements
Ignore test-data directory to avoid uploading uncompressed (see uploads)
Updated bin/needle so it behaves more like cURL.
add vim recipes
initial commit
Merge branch 'master' of https://github.com/tomvdb/euler
updated readme.md
Minor refactoring in the Poc

Made the field inicialization part more generic.
bug fix (order of operations)
return(a) to term.find
add README for config files
add parameter to force receive timestamp to be used (epc template)
Fix test: inttest/t_custom_config
Fix warning in inttest/tplugins/tplugins_rt.erl
Refactor ci support
loc edit again
adding ip-based security
Updated _posts/2011-02-28-o-week-stall.md
HBASE-6710 0.92/0.94 compatibility issues due to HBASE-5206

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1384181 13f79535-47bb-0310-9956-ffa450edef68
HBASE-5631 hbck should handle case where .tableinfo file is missing (Jie Huang)



git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1382529 13f79535-47bb-0310-9956-ffa450edef68
黑白名单启动处添加form，不需要即可删除

<input type="hidden" value="" />
form包含checkbox
Se agrego la documentacion respectiva para la generacion del JAVADOC
Se agrego documentacion respectiva para la generacion del JAVADOC
Se agrego Documentacion pertinenete para la generacion del JAVADOC
Se agrego documentacion pertinente para la generacion del JAVADOC
cleared the code in script.js
Changed the extensions of HTML files to PHP and validated the Registration Form
Fix AssetController so that it does not merge assetData with the request data, but instead adds a loadData property which contains whatever the assetData is (e.g. an error message or responseText for a Raw request). Tests have been added so that behaviour is specified
add plusplus to search.html
add plusplus to quotation.html
using SQL::Maker in data_storage
remove diag line
added hooks - run and connected
added a sample plugin - WelcomeMessage
Changes to resolve EF deleting issue when a property is access due to a server-side rule running
[Profiler] Sub requests are not Main requests
Improvement in vim and bash
fixAjaxSafari
Updated ukrainian localization
Added ukrainian localization to requirements application.
Move env-test macro files
Move env-test transform files
fixed limit=10 problem
alterando lugar do CSS
ajuste do modal de vale-presente
css pagina minhas listas
Abnahme des Tons an versch. Stellen der Saite
merge conflict
Use the more idiomatic tap method
Custom coders support for ActiveRecord::Store. JSON, YAML, Marshal can be used out of the box.
Improve and cleanup a bit partial renderer

* Remove template assignment: there is no need for this assignment,
  given we are rendering a collection with possibly different templates,
  and a second call to render (with the same instance) would behave
  differently if the template is set.
* Remove segments array in favor of Array#map
* Use local vars whenever possible
* Cache local template keys, remove defaults from find_template
fix todo: use minitest skip instead of return nil
Merge pull request #6293 from carlosantoniodasilva/render-partial-refactor

Improve and cleanup a bit partial renderer
Merge pull request #5729 from oscardelben/use_tap

Use the more idiomatic tap method
mailer can be anonymous

closes #5970
Merge pull request #6298 from frodsan/fix_todo_skip

fixme: use minitest skip instead of return nil
require "rubygems" is obsolete in Ruby 1.9.3
Fixed ruby-prof changes and let's use latest ruby-prof now.
Need to include "OutputSaftyHelper" here to prevent

`number_with_delimiter': undefined method 
`safe_join' for 
#<ActiveSupport::Testing::Performance::Metrics::Objects
Merge pull request #6303 from korny/remove-require-rubygems

require "rubygems" is obsolete in Ruby 1.9.3
Remove remaining require 'rubygems'
Remove blockless_step leave all that up to Ruby

Closes #6297
Refactor App Generator Test
remove useless tests for Range#step
Merge pull request #6308 from nashby/blockless-step

remove useless tests for Range#step
use const_defined? with second argument in AS::Dependencies

there is no need in local_const_defined? helper method
Autoload ActionDispatch::Request::Session to avoid circular require.
Merge pull request #6307 from oscardelben/refactor_app_generator_test

Refactor App Generator Test
clean up iqstream/oqstream semantics

- no more boost::optional
- explicit opened/closed state for both streams
- stream dtors handle closing/aborting
- clearer documentation of queue class
update handler to use new iqstream/oqstream
CR: use container_type
CR: don't need to construct intermediate string
Merge pull request #6 from wavii/clean_streams

Clean streams
some sql files for transmog
add function editable
troubles with python-requests 0.14.2
ios: fix a bug that hangs in latest view page
Removed a leftover print statement and fixed level completion freeze
bug.
do not load form library twice
category dropdown field for settings library
[WIN32] removed some more statics.
[WIN32] make ProcessResults() optional
Dead code elimination
Merge branch 'master' of github.com:wtsi-hgi/IYG
blockquote examples
okay, putting pg back
add unp_lib
- user -> validate email
- user -> validate email
- i18n
- layout
- i18n
- layout
main: Remove spurrious delay
Added a white background to the Kinect logo on the report's front page.
Put the images from Alex's section inside figures
Minor changes in layout
improvements:
- load converters stack description from an external file
(converters.txt)
- added command line options for merging cached files and running
without analysis
- added command line option for forcing clustering
Add a comment explaining what is passed to custom middleware when it is first loaded.
Merge branches 'develop' and 'master' into develop
sorry for the big honking commit. we're cleaning up our git/scm process now...
Fixed misspelling.
Merge branch 'docs_hosting_container_reqs' into develop
first commit
Merge branch 'master' of github.com:yakxxx/memek
gitignore
toolbox.FileCache implemented
saves and loads work now

there was slightly inexplicable bug that wouldn't work right
cleaned up toolbox.FileCache
Modify the environment settings for shell

dify the environment settings for shell
Moved element cloning into handler of drag start
fix indenting and no smart indent
Add google openid signin
localization
localization
Improve hyperlink
move import into model
Move method from controller to model
a day of work
improve new from params
fix spec
training of models
1

Signed-off-by: zcosmo <z_cosmo@mail.ru>
disable destroy_linger for green tests

it causes weird problems that make no sense, and may in fact be a bug in libzmq >= 3
Remove binding.gyp
remove -Qunused-arguments
fix a forward name
manually fix svg path problem; a doxygen bug
Tunes settings.
...
...
seems to work now that i have stopped being an idiot
progress: Updated readme and applied go fmt.
add ENV DMENU_FONT for my use
importSVG: ignore the viewBox if not absolute untis are

given for width and height and sort edges before trying to make a wire
Further work on Arch vector renderer
First working version or Arch vector renderer
Arch SectionPlane now uses the new vector renderer
0000636: Two documents close
0000661: cmake build on Mac OS: dealing with dylib versus so
More testing of kronecker generation of grid points
work
added ring module.
Enemies pace back and forth sort of.
Merge branch 'master' of https://github.com/Adhesion/ld24

Conflicts:
	data/level3.tmx
Use minified.
A CloudFlare resolver in Python.

A CloudFlare resolver in Python.
add multiple selection of category for work
Added basic logging (for place/break events)
Moved some classes into their own file
Updated plugin.yml
Swag
Updated to use LIBMINC instead of MINC
Merge branch 'master' of git://github.com/BIC-MNI/BEaST
[Change] 修改文件编码
Added a unified executable for client and server.
Merge branch 'master' of github.com:Bantik/synack
[MOD] XQuery, QT3TS: various minor fixes 
[MOD] XQuery, cache identical patterns
[MIN] XQuery, error handling in unparsed-text-available()
[MOD] minor formatting issues
[MOD] Locking revised (joined with existing updating preparations)
[MOD] GUI: Open .basexml files as text
[FIX] GUI: write query results with result caching turned off
Time manager adjustment
Reorganizing .vimrc a bit
#18 PhotoSwipe: devide Diary and comment gallary
building traffic jam avoiding function
Added path to resources

It's a new argument in SimpGLinitGL(), and it's used when loading
textures as a prefix. A trailing / on the resource path is required.
[0.5.6.180] Improve Movement System of Unit.
Implement Object ModelSize
[DS-1362] The Sort search options graphic (that looks like a gear) is missing.
Merge pull request #120 from atmire/DS-1362

[DS-1362] The Sort search options graphic (that looks like a gear) is missing
remove license headers from robots.txt

On Tim's suggestion, I'm removing license headers from robots.txt
They don't have proper comment format (#) and they're already
excluded from license:check
clean up old templates
add initial css
add initial css
add user posts route, and clean up everything related
English noun attributes, test cases for forbidden noun-noun combinations
implemented forbidden noun-noun combinations based on noun persion
Add remote to omapzoom

Change-Id: I79e679d863de8665185aa1bf1f9cc7380f468f27
clean warnings
prevent double deregistration
Release of com.dexels.navajo.rhino version 1.1.12
Development stream of com.dexels.navajo.rhino version 1.1.13
Forgot to remove a few unneeded variables.
typo in sites.
Added status code pages for 404, 401, and 500
Added status code pages for 404, 401, and 500
Got the 401 error to work and testing stack traces to print out properly.
Updated installer for 0.5.1
Nouvelle architecture avec fichier de config.
Use -Wall and -Wextra compile options
configd todo description

Signed-off-by: Daniel Borkmann <borkmann@iogearbox.net>
builtin_client: be less verbose

Signed-off-by: Daniel Borkmann <borkmann@iogearbox.net>
Merge branch 'master' of github.com:EPiCS/reconos

Conflicts:
	linux/tools/configd/builtin_client.c

Signed-off-by: Daniel Borkmann <borkmann@iogearbox.net>
Merge branch 'master' of github.com:EPiCS/reconos
Targets draft
Did some more of it.
rtpenc: Add support for packetizing speex

This packetization scheme simply places the full packets into the
RTP packet without any extra header bytes.

Signed-off-by: Martin Storsjö <martin@martin.st>
rtpdec: Support depacketizing speex

Signed-off-by: Martin Storsjö <martin@martin.st>
rtpdec: Remove a useless ff_ prefix from a static symbol

Signed-off-by: Martin Storsjö <martin@martin.st>
truemotion2: Request samples for old TM2 headers
nutdec: const correctness for get_v_trace/get_s_trace function arguments
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  nutdec: const correctness for get_v_trace/get_s_trace function arguments
  truemotion2: Request samples for old TM2 headers
  rtpdec: Remove a useless ff_ prefix from a static symbol
  rtpdec: Support depacketizing speex
  rtpenc: Add support for packetizing speex

Conflicts:
	libavformat/rtpdec.c
	libavformat/sdp.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
lavfi: enable buffersinks unconditionally.

They are part of the public API. Their libav compatibility
counterpart are already enabled unconditionally.
dsputil_mmx: fix reading prior of the src array in sub_hfyu_median_prediction()

This should fix the utvideoenc valgrind failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
acelp_pitch_delay: add missing libm.h include for exp2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
vf_hue: fix AVOption defaults

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Fix duplicate packet init introduced by 7f9aaa4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
swr/resample: move templating parameters to template itself.

It has various benefits such as allowing some refactoring, clarifying
the code in the inclusion part, and making the template understandable
in standalone.

This commit is based on the templating method used by Justin Ruggles for
libavresample.
swr/rematrix: move templating parameters to template itself.
lavfi/geq: fix GPL license header.

100l: original code is GPL, header miscopied. LICENSE file and configure
dependency are fine.
pp: fix a few typo in the internal header.
pp: use av_clip_uint8 instead of a custom implementation.
pp: fix typo in avg() comment.
swr/resample: fix SSSE3 included unconditionally.

10l Regression since 8ea88339.
vc1dec: do not allow field_mode to change after the first header

Fixes out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
rv34: check image size before using it

fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
h264: initialize frame-mt context copies properly
lavc: set frame parameters after decoding only if necessary

Direct rendering capable decoders call get_buffer() which will set the
frame parameters.

Prevents frames with wrong parameters when a decoder outputs delayed
frames after a resolution or pixel format change.
mpegvideo: treat delayed pictures as used

This requires to move the avcodec_default_free_buffers() call to
ff_MPV_common_end() since otherwise delayed pictures would get freed
during a size change.
x86inc: fully concatenate tokens to fix macro expansion for nasm

Fixes build errors with nasm introduced in 6f40e9f070f7 for stack
memory alignment. Noticed by BugMaster.
asyncts: ignore min_delta only if first_pts is set
asyncts: merge two conditions
ivi_common: make some functions and tables static.
ivi_common: use proper logging context in ivi_decode_blocks().
ivi_common: check that scan pattern is set before using it.

Fixes CVE-2012-2791.

CC: libav-stable@libav.org
Merge commit 'bd255f9feb4deea4c990e582f0ba3b90d7b64b4c'

* commit 'bd255f9feb4deea4c990e582f0ba3b90d7b64b4c':
  lavc: set frame parameters after decoding only if necessary

Conflicts:
	libavcodec/utils.c

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

* commit '6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13':
  mpegvideo: treat delayed pictures as used

Conflicts:
	libavcodec/h264.h

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

* commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f':
  asyncts: merge two conditions
  x86inc: fully concatenate tokens to fix macro expansion for nasm
  h264: initialize frame-mt context copies properly

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

* commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd':
  ivi_common: use proper logging context in ivi_decode_blocks().
  ivi_common: make some functions and tables static.
  asyncts: ignore min_delta only if first_pts is set

Conflicts:
	libavcodec/ivi_common.c
	libavcodec/ivi_common.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ivi_common: check that scan pattern is set before using it.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
westwood_vqa: fix null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ass_split_section: dont overread array

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Revert "raw: move buffer size check up."

This reverts commit cc5dd632cecc5114717d0b90f8c2be162b1c6ee8.
The change was redundant, it has been fixed long ago (422e3a7)

Conflicts:

	libavcodec/rawdec.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg: more verbose error messages in case of audio encoding failure.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg: fix handling or empty audio packets

Fixes Ticket1131

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
added .out in .gitignore
messaj
fixed: email form plugin, if no email to options set, the sql query produced an error
langugage label/descriptions were the wrong way round as well
changed: multipage forms, validations no longer run when going back a page http://fabrikar.com/forums/showthread.php?t=27817
merge
Fixed redundant call to 'ar' for libarum.a
Added resource counters with -r or --resources such as rss, swaps, and context switches
Added instructions on how to make kernel headers
Remove Main.C.  It is in Arum.C
Removed some unneeded variables to prevent compile warnings in Hardware Counter
new Vocabulary
Using 2-space indentation style for engine.cc also.
force cluster example: fixed minor hull error ('hulls' --> 'hullset') + augmented example, showing distance function based on collected node/group info + click on node to expand/collapse (toggle) instead of harder-to-perform dblclick.
Convert 2-digit years according to POSIX.

This is also the convention used by Python 1.5.2+. Values 69-99 are
mapped to 1969-1999, and values 0–68 are mapped to 2000–2068.
Fix node-canvas example.
d3_time_century() would always return '2000' (unless you go way out of your way and then you'ld get 1000 or 3000, never 1900, because it divides by 1000, instead of 100. Never mind. It's only used internally, and there it's only to help 2-digit years become 4-digit years. Fix: convert to 4-digit year according to POSIX/ISO rules (strptime) ~ http://docs.python.org/py3k/library/time.html
Merge remote-tracking branch 'remotes/jasondavies/master'
Merge branch 'mbostock'
Merge remote-tracking branch 'remotes/jasondavies/date-2d'

Conflicts:
	d3.v2.min.js
	src/time/format.js
fix: script tag:  unhandled exception in case of "src" attribute with absolute path

+ some unit tests
builtins workaround for 2.x, and some other stuff I forget
add authentication_token to user model
Pet battle fixes.
Add time to messages
Fix: newlines causing ping timeout
Fix key error
8ball fancyness
BeautifulSoup error
Add stuff to 'choose' module
BS compability
Japanese transliteration fix
Take advantage of plString more in hsStream's String I/O functions
Add string split and tokenize functions
Convert SDL (mostly) to plStrings
Add support for Visual Leak Detector, since valgrind doesn't support MSVC
CoreLib fixes for Linux.
Fix plResManager stricmp.
Fix a whole bunch of clang warnings.
Get rid of const char* warning in plPythonPack.
Corrections as proposed by @branan.
Move Python string helper to the correct location
Merge pull request #231 from dpogue/fixes

Linux fixes
Manual merge of Pull Request #232 from zrax/plString

Conflicts:
	Sources/Plasma/CoreLib/HeadSpin.h
Remove hsFileStream

It's unused windows-specific garbage.
Fix UnifiedTime collision

Win32's GetCurrentTime and plUnifiedTime::GetCurrentTime collided. Rather
than hacking around the solution by undefining GetCurrentTime, we rename
plUnifiedTime::GetCurrentTime to plUnifiedTime::GetCurrent. This fix is
less fiddly than an undef hack.
Remove global Windows.h include

This is the beginning of efforts to reduce the scope of Windows.h. I have
shuttled it into hsWindows.h (again) and fixed the compilation of the
major apps. There is still some scope work that needs to be done, and the
Max plugin has not yet been addressed.
Fixes some oversights.

Okay, what moron left out the include guards on hsSTLStream.h? Come on,
man.
Remove windoze include from hsThread.h
Be smarter about Pch.[h|cpp] files

As pointed out in #225, Pch.cpp looks suspiciously like a garbage file
when precompiled headers are disabled in cmake. To solve that, I have
changed the precompiled header function to add the Pch source files only
when pch is enabled. This should prevent future accidents.
Smack MaxComponent

This is a huge, complicated project. Therefore, this untangling is not as
comprehensive as the others. It should compile faster and be a little bit
neater, but that's it. Don't expect the headers to look much better!
Untangle MaxConvert

Fix compilation as a result of hsWindows. Also, add precompiled header
support (this shaves off 9 seconds on my machine) and fix some warnings.
As we saw in the PCH-ization of pfPython, includes were untangled (to some
extent) and forward declarations were introduced where appropriate.
remove sheet4 code solution
Control code refactored.

Now the XVM Control superclass has an easier to
extend structure, which needs less code from its
subclasses.
The OL Control is now created when we instantiate
the XVM Control, in order to make the superclass
not instantiable.
android tutorial minor layout fix (also my first test commit)
[maven-release-plugin] prepare release jADT-0.3.0
MPS-16628 [build:IC-117.798] Failed to create cell for node... - remove assertion on scope with empty module set (e.g. empty project)
Merge remote-tracking branch 'origin/MPS2.5'
Manually update the history modifications of plugin/structure.mps
fix tests (regenerate, add dependency)
fix tests (regenerate)
MPS-17031 Intentions are shown twice in intentions menu
renamed classes to hit spec.
[add] Command line parsing
[add] CMake list and include directory
Removed from Travis too.
Task F5. Making images clickable
automated lexer
Resolve warnings about used enum values in switch blocks.
Resolve warnings about shadowing parameters and local variables.
Resolve ambiguity warning regarding use of && and ||.

This is not ambiguous to the compiler, but it may seem ambiguous to
the reader.

From reading 3a53005f (Build object library targets in VS), 5484550a
(Detect and set Unicode character set in VS 10), and 9e01aefd (VS:
Add support for WinRT project properties (#12930)), this appears to
be the intentional semantic.
Remove references to ancient and removed parts of the code.

This file came from ITK, and probably came from python before that.

This commit fixes a warning about the unused _PyPopenProcs variable.
Enable some compiler warnings when building CMake.

The warnings are enabled for now only when using GCC 4.2 or later.
It may be possible later to also enable them when building CMake
with clang.  Don't duplicate the compiler flags if already set.
Merge topic 'compiler-warnings' into next

d06a9bd Enable some compiler warnings when building CMake.
Merge topic 'fix-compiler-warnings' into next

737534c Remove references to ancient and removed parts of the code.
21e8a08 Resolve ambiguity warning regarding use of && and ||.
5f6432f Resolve warnings about shadowing parameters and local variables.
9f16d42 Resolve warnings about used enum values in switch blocks.
iss739 change history
Add Spanish translation
Merge pull request #37 from Kwpolska/master

Manpage language options
Merge branch 'master' of git://github.com/alejandrogomez/aura into alejandrogomez-master

Conflicts:
	Aura/Languages.hs

- Fixed some minor mistakes.
Added spanish update to changelog
Added PKGBUILD makedepends to depends field

- This is from a request on the AUR.
Fixed spelling mistake in changelog
Changed PKGBUILD back to remain consistant with PKGBUILD specifications
Added past activity to changelog
Replaced regex-posix with regex-pcre

- This may appear to be a very minor change, but I did quite a bit
  of testing in the background.
- This change actually opens up a new bug, which I have reported to the
  maintainer. Any PKGBUILDs that contains characters that are not stored
  with 1 byte (like Japanese) explode the dependency checking.
  This is due to regex failure. Again, provided the maintainer
  gets back to me, this should be cleared up soon enough.
  For now, pray that everyone uses English-only PKGBUILDs.
Replaced regex-posix with regex-pcre - fixes #29

- This may appear to be a very minor change, but I did quite a bit
  of testing in the background.
- This change actually opens up a new bug, which I have reported to the
  maintainer. Any PKGBUILDs that contains characters that are not stored
  with 1 byte (like Japanese) explode the dependency checking.
  This is due to regex failure. Again, provided the maintainer
  gets back to me, this should be cleared up soon enough.
  For now, pray that everyone uses English-only PKGBUILDs.
Merge branch 'master' of github.com:fosskers/aura

- I was silly.
Changelog update
Borrowed functions from `ansi-terminal` into aura

- This allows me to remove `haskell-ansi-terminal` as a build dependency.
- PKGBUILD and cabal conf file altered to reflect this change.
Removed version restrictions from cabal conf file
Fixed a bug related to `haskell-bytestring`

- haskell-bytestring was not being recognized properly as a virtual package.
  This was causing build failures, it seems.
Added `arel` tool to project

- Also made a minor change in `Zero`.
PAC. MAN.
`Bash` library can now parse global variables from a bash script

- Distinguishes between normal strings and arrays.
- Cannot yet do variable replacement, but that is next.
Made variable parsing more general

- Used better names.
- Functor instance added.
- Code is a bit cleaner.
Variable referencing now possible

- Strings/Arrays that reference variables will have their contents
  altered accordingly.

e.g.
foo="sandwich"
bar="i-like-${foo}es"

The value of bar here is "i-like-sandwiches"
Draw Start Trunpoint Over all other.
AutoMC do not use EqMC when not flying. OnGround is not useful, it does not proove we are flying.
Revert "(CC) and more about Equivalent Mc."

This reverts commit 1f6e81f43ea22d641022b53bdad122dfa0dbe323.
Revert "(CC) Calculations.h Circling integer to bool, AutoMacCready integer to bool, OnGround integer to bool."

This reverts commit 11a409c17eba67ed439d8898566631629d2a76a1.
Merge branch 'TaskUpdate' of http://github.com/brunotl/LK8000
FIX: shared library
Made the codes more readable.
#9 Collect set of accounts for which an invoice must be created
#9 Some utility methods and cleanup in bundles required for invoicing
#9 Construct invoice from available data
fixed server bug when placing bomb
lua.cmake: fix add_lua_test when no install_lua_modules called.

Note: foreach (_i RANGE 1 0 2 ) oddly not allowed by cmake.
You don't even want to know. Just wait until this is done.
More Gtk interface work
More work on the new interface
added sequence record indexer and binary file format for indexes
Merge pull request #16 from jaredwilkening/master

sequence file type indexing
Make BUILD executable
Merge pull request #5 from narayandesai/master

Make BUILD a script
Update src/view/Editor.java

Nu se va mai folosi. Probleme de nume.
Added Menu body
Removing old Library folder
Plugin manager is fixed for good now. i think...

I added a new method so that rather then checking if the args types are
equal, we can check if they are equal, or if the extend each other. I
mean, the way I was checking before, Player and Entity would return
false, even tho the code would have worked. Now, you can pass in a
player to a method that takes an Entity as its param and it passes the
check.

Also added more debug to figure out that that was the issue, commenting
it out for now.
Update post text area to only have 4 rows
Fix incorect logical usage in gamma related function (fix anp and a couple others)
Fixed lsq_lse_solve
Fix operator resolution
add missing includes in optimize
make ulp testing macros not dependent on external variables and typedefs
make constants always return the type that is requested
Testing new messagebox at the end
Merge branch 'master' of github.com:MiJyn/relinux
(ucounter16_tb) Dump .fsdb.
Fix possible undefined behaviours in libmythprotoserver

The intermediary QByteBuffer returned by toLocal8Bit would have been destroyed at the end of the expression, making the pointer used invalid.

Wondering what kind of crash/instability this would have caused.
I went through the whole code, and only found those two.

Thanks to Malcolm Parsons (pepsiman) for reporting a similar issue in 9ea5252bc3a6367dacec1b4f92f03c13fbd0f0e4.

[cherry-picked from 5aaca58157c6456b88e500ccacbde91e31dcb534]
Merge DBChannel and ChannelInfo classes. Make (dist)clean recommended
Move MythTV's mpegts to mpegts-mythtv.c to make easier merges

Since our mpegts is so different from ffmpeg's and it's unlikely they will be
converging any time soon, I'm moving our version as a new demuxer, and with
the default name "mpegts" pointing at our version rather than ffmpeg's, which
will be available as "mpegts-ffmpeg".
OK, that was the right idea, but the wrong way around.

Rename the functions in the ffmpeg mpegts.c that collide with ours and where
we want ours to take precedence.  This was confusing the probe functionality
the other way around.  Also, disable mpegts-ffmpeg demuxer.  The code should
still be sucked in for wtv support though.
Update the Russian translation of mythfrontend, mytharchive, mythbrowser, mythgallery, mythgame, mythmusic, mythnetvision, mythnews, mythweather and mythzoneminder.

Fixes #10487.

Signed-off-by: Kenni Lund <kenni@mythtv.org>
Merge branch 'master' of github.com:MythTV/mythtv
Fixed android startup and refactored util

Calls to getHostName on an InetAddress were causing 10 second lockups on
Android. All calls to getHostName were replaced with getHostAddress (the
original lines were commented, not removed). This change allows for fast
startup on networks without DNS and fixes the startup connection
problems observed on Android. I moved getNonLoopBackAddress from jGroups
into FragMe and refactored it a bit. I also simplified the way
properties are defaulted in JChannel.
Enable/Disabel Providers (fix #14)
oops, one more...
Added missing dll export macros.
Updated the Pokemon classes. Their statistics are computed juste after to set the exprience. Also, the Pokemon Team Manager would be display in battle, but it doesn't work for now.
Added requests classes for the following tables: PokemonStats, PokemonEV and PokemonMove. These classes are empty for the moment.
Updated the global Pokemon system.
Changed the database structure and added a new directory to store the database creation script.
Updated the Pokemon's experience system and the data selection from the database. Now, a Pokemon owns its stats from the database, and its Effort Values are also stored.
Final merge between master and game-update.
[opam update] fix the failure to read Path.R.updated because it contains wrong lines taken from the output of "rsync"
Changement du modèle de coloration syntaxique
First version of the Web in a Git reposotiry
Merge branch 'master' of https://github.com/Onturenio/WEB

Conflicts:
	publications.html
	stuff.html
Added Allies 01 SP map and Allies01Script.cs
Made Soviet attack waves a bit saner
Remove unneeded UnitsNearExtractionLZ code
Use IsInMap & IsInWorld to detect whether Einstein has been saved
Remove more unneeded code, use CallFunc activity to make Tanya laugh when she disembarks.
Don't need lzRange
Use SharedRandom to stop desync
Tabify lines
Remove redundant call to InternalName when mission failed
Merge remote-tracking branch 'scott/bleed'
gesture fixed
ajout du document et du makefile.
FIX camelCase error
first commit with basic program
isErsatzmitglied entfernt
HoleEdit: Use listToMaybeL instead of genericNull
HoleEdit: Widget.EventHandlers
added fixes in the test procedure for cards
added basicGame class
Merge branch 'cardLib' into development
corrections in toDeg() and display()
[105] Big update here.. Rewritten alot of the JS code, made it more up to date and neater.
Added expire date to JsonCache
Fixed XML comment warnings
Updated version in nuspec file for NuGet
Upgraded the manifest to version 2 as is required by google , extension not yet tested
Added new libgpg file requirements which are needed for windows
Renamed a couple binary storage locations.
Moved images to the images folder.
Added new options.js and background.js which will now handle most js code , this is required by the new manifest rules.
Also started re writing the background code , converted the encrypt and decrypt code.
Decrypt is currently not working.
Removed old dll
Fixed the decrypt handler , now uses libgpgme
Changed the verification code in the background to use the new lib.
Removed couple of lines of codes that were not required anymore.
Fixes to the popup and clean up of the background.js code
trivial edit; testing post-commit hook
moving towards 3.2.1, updated changelog/contributes/licesen. fixes #194
RAXAJSS-386 working on submit without BMI
RAXAJSS-386 Merging upstream changes
Casper Integration test and minor reg changes
merging upstream
RAXAJSS-446 allow user to navigate back from new patient Confirmation to Page1
Merge remote branch 'upstream/master' into registration
refactoring confirm page
CRLF -> LF Line endings
merge with master
Bug fix: on cancel (or registration submit) clears the fields for fn and ln in hindi
refactor registration autoComplete to use Store
removed unneeded files, add license
more removing of junk files
Allow New Patient registration to submit properly if no Hindi name included (sometimes was trying to send undefined)
Fix linting errorz
Hiding Mohalla per Sharayu request
Changing empty text first to last
fixing bug.. submitting with blank registration complaint could cause Encoutner to fail to submit
Clear height weight and BMI after submitting or canceling
Merge pull request #234 from nathanleiby/registration

Registration fixes
unified mix panel register

unified mix panel register
SmallMessage can not be empty
Fix message edit template
1029 if文
Fix typo in bccc.ui.util.SmartStatusBar

Sorry! Next time I'll test trivial changes too T_T

Fixes #14, and thanks to @tkoski for all his bug reports.
Settings, CustomCell, WaterMark, Singleton
1 添加js html文件
1.删除掉
- печатные формы, логирование всех действий
refactor: main function, Renamer class, logging
refactor: removed templating over python code, added logging
Use new connection and get result when try to create new site
Merge branch master into 'slaprunner'
Slaprunner: pin versions.
Release slapos.cookbook-0.45 (slaprunner)
Advertise development of new version
Go back to development
Add report url.
Merge branch 'master' into agent
Add path temp file.
KVM frontend only listens to local ipv4 (and then admin does a iptable rule)
Restore raising KeyError.

Request has to fail if a connection parameter can not be accessed.
No need to publish frontend connection.

Connection url are only usefull for slave instances.
Publish connection twice.

First section publish the backup url.
Second section publish the frontend url if available.
slapos component : Pin versions
Simplify LAMP stack(s) again, by using slapos.cfg stack
Simplify lamp-template example after stack simplification
Fix gcrypt LDFLAGS for gpgerror

LDFLAGS -L and -Wl, rpath is a path of directory.
Update libgcrypt
Cleanup gnutls ldflags
Blah
Explicitly add gpg-error library in linker flags
Envelopes use absolute values + bugfix
prettify CurvePanel.java
remove effects tab
Prasanth is a moron
basically whitespace changes
added entertainment ball
Added a rudimentary script view
New store. You may need fresh install.
ゲームインスタンスを実装

グラフィッククラスを継承したインスタンス用のGAME_gクラスを定義。
タイマークラスを一部修正、KeyCodeを追加。
今までのGPLがGLに移動し、GPLを本体として扱うことになった。
描画系においては最低限の機能が揃ったので、これから詳細の機能を追加していく。
implementing DrawTransferMenu
-Remove [m added by craftbukkit
-Remove ,'s from player list.
Admin for apps (just for ease)
ajout du répertoire de librairies
show photo point on the trip
logs only on `--debug` arg now...
Scons: Use glob to get source list instead of maintaining it manually.
Fix text_draw include in hudgauge.
Fix invalid define check in guilanguage.
Syntax rules: Support templates and loops
Fix long options' arguments
Very quick fix to make the adhocbenchmark fail fast if a query fails.
More to come.
Revert pull #74: Bin printing in studio
https://github.com/VoltDB/voltdb/pull/74/files
Put back the hex.
Merge branch 'release-2.8'

Conflicts:
	tests/test_apps/adhocbenchmark/src/adhocbenchmark/Benchmark.java
Based on code review with Ning, remove dead constructor parameter to ProcedureRunner.BatchState
Minor fix for assignment_sim_result_html_view with html_safe
Fix for graph_sim_result_html_view
Add three refactored models
- SubmissionClusterGroup <- AssignmentClustering
  SubmissionSimilarityLog <- PlagLog
  SubmissionSimilarityProcess <- CheckPlagId
- Includes routes, models and migrations
- Controllers and views are pending
show done slides in agenda-view
everything works as expected at the moment, barring a few misalignments
due to codes being the wrong size
Fixes
Mod context
Move templates
Make Config Form
add connection checks in context
stable
Create css for .navbar > *
Modify $.fn.UseModal : $.get > $.ajax
Remake ref/event treatment
Finalise addRef in treatment
Add login
Add User configuration
Suppress some options for non-superuser
Add __doc__
add fog coordinates sample code
[Internal] Externalized Win32 Debugger Sources
comment out daily prescise build.. keep w/ beta1
Merge branch 'release/essex-hack/master' into release/essex-hack/openstack-os-build
finished first version of sparse maximum correlation
Merge branch 'issue3478' into stable
ABICLOUDPREMIUM-3271, attach ip
fixed apiError conflicts
Fixing bugs in activate

* Add a few more paths to the generated path
* Bump the default lua version to 5.1.5
* Support absolute path names
* Update readme
fixing back to top anchor
order center/states by name, unsortable, state select
website field should be a link
Licensed project with two-clause BSD
Added NOTICE file referencing CppUnit
Shameless plugs
added support for listeners

No longer require to listen for specific commands but
can monitor all chat to the channel.
added "should of" listener plugin
updated readme