labofsahil/github-event-dataset-2012 huggingface dataset:
fixed typo, thanks Mart
fixed bug in language file that corrupts files on language update, thanks kverdecia2
fixed bug in tickets2emails, thanks Niphlod
R-2.0.6
faster better web2py_uuid, thanks Michele
reverted to bootstrap 2.0 because of problems
allow to pass hidden to crud.update
better ldap_auth thanks Gyuris
Upgrading to Simplejson 2.5.0
Updating rails and refinery versions
Removing old calendar engine
Generating new events engine
Remove some remains of the old calendar engine
Minor refactoring
Refactoring
Adding FriendlyId to Events
Added the left sidebar helper.
Showing refactored left sidebar on ministries.
Showing refactored left sidebar on staff/pastor views.
Adding validators for events
Using email validator to validate email
Establish relationship between event and ministry
Added 'general' layout and fixing some nested template issues.
Merge branch 'layout_refactor'
Merge branch 'master' into events

Conflicts:
	db/schema.rb
	vendor/extensions/ministries/app/views/refinery/ministries/admin/ministries/_form.html.erb
Upgraded sass-rails to 3.2.5.
Fixed layout for events index.
Adding events back to the menu
setting time in the events form to show AM/PM
Added show custom showlist.xml
Working example of basic code with test cases, now time to optimize + provide benchmarks
INKLESS-1046: add root logger
Merge branch 'master' of github.com:melexis/mapmerge into INKLESS-1046

Conflicts:
	python-mapmerge
Update location of log files
only one piece per composer on front page featured works
before pull
added date
Merge branch 'master' of https://github.com/melstrom/cs304p3
changing jump code and gravity
test commit #167...
Create rosetta_go.txt

All problems on rosseta code that haven't been written in golang.
AggExisting: check for changing files
  Aggregation.Dataset: use MFile
  InvFcGrib: eliminate group name when only one group
  upgrade log4j version
  remove catalina dependent code in TDS
Fixed vertCoord param bug in ncss grid requests. 
Added content-type header in ncss grid responses.
First simple integration tests in it module using RestFuse.
PHPCS - example
repaired problems with submodules
more submodule fixes
Airplay bugfix
Tank collisions
Did some minor updates.
use distribution/hypergeometric
thumb_s crop false
7/2 (월) Bravo4U 서른여섯번째 코밋.
fixed #1089: win32 support ipad, new ipad
optimize CCTextureCache::removeUnusedCache()
Replace Guard by Grunt
Add miniBoilerplate reference
Database mirroring support and tests
changes from github
overriden changes of category module
ignored configuration and user guide
layout applied in create category
Person's Data

Add,Update and Delete Person's Data
persons module completed. initial search implemented in frontend
added person model and frontend search view
removed gitattributes, updated gitignore
updated gitignore to ignore user_guide and nbproject
added subtree of nbproject and user_guide to gitignore
Refactored _SERVER as an injected dependency
Added test dir
Added test for CGIGateway
Paula::Library requires 'paula'
library test: doesn't work with anonymous classes
Split out XMP and MDXMini Library, Player classes
MDXMini: cache duration before playback

MDXMini's mdx_get_length() function unexpectedly recreates the songdata
struct every time it's called, resulting in the song restarting any
time it was called. Instead cache it to an ivar before playback starts.
MDXMini: add release method to T_mdxmini struct
Remove unused helper file
add tiny_mce editor to form helpers
Merge branch 'master' of github.com:mittmedia/wp_mvc
[#2140] Declared googlemaps options inline
initial commit for DropDown plugin
Disallow reserved words as key variable names in a foreach, just as they are
disallowed as variable names everywhere else.


git-svn-id: http://kolmafia.svn.sourceforge.net/svnroot/kolmafia@11386 b29ace70-8910-0410-8dcc-aa2fc6433167
the for loop also cannot use reserved words as index variables


git-svn-id: http://kolmafia.svn.sourceforge.net/svnroot/kolmafia@11387 b29ace70-8910-0410-8dcc-aa2fc6433167
At startup, correctly deduce the Spooky Forest choice adventure setting from the current preferences. Thanks to AtlanteanScion @ kolmafia.us.

git-svn-id: http://kolmafia.svn.sourceforge.net/svnroot/kolmafia@11388 b29ace70-8910-0410-8dcc-aa2fc6433167
Correctly handle multi-using peppermint sprouts


git-svn-id: http://kolmafia.svn.sourceforge.net/svnroot/kolmafia@11389 b29ace70-8910-0410-8dcc-aa2fc6433167
Wrap Drops section of Daily Deeds when many things are listed there

git-svn-id: http://kolmafia.svn.sourceforge.net/svnroot/kolmafia@11390 b29ace70-8910-0410-8dcc-aa2fc6433167
Improve logging for disco and rave combos


git-svn-id: http://kolmafia.svn.sourceforge.net/svnroot/kolmafia@11391 b29ace70-8910-0410-8dcc-aa2fc6433167
Cambio en el xml de strings.xml
Added functionality to activity.
Activity can split a time_tracker that expands on
multiple days in several time_trackers belonging
to their particular day.
Updated index of comps
fixed instags - workaround to display unsiged values
bump version 0.0.3
Minor bugfixes and additions for bxd_external_derivatives.f90 bpf_model_run.f90 and the python codes for Condor
Fixed some more style in lab3. Gave credit to Simon Scott in part6.
task 847 resolved
Harshit | Fetching currentFamilyPlanning method for EC and gender for child.
Improved IP whitelist checking
[AspNet Mvc] Razor syntax highlighter
[AspNet Mvc] Razor Editor Extensions

Code completion and document outline.
[UnitTests] Razor completion tests
Merge pull request #216 from sparek/editor-extensions

[AspNet Mvc] Razor editor features
add tarballing
proba schowanie api key
security role attributes have no default value

I added a default value to them when I converted the messaging subsystem
resources but they don't have default value (as they are not nillable)
split of cmp relationship tests
AS7-5409 Tighten system property handling by the ProcessController
[JBWS-3535] rollback org.apache.cxf.impl module meta data export - not needed for Apache CXF 2.6.2
[AS7-5440] Upgrade to JBossWS 4.1.0.Beta2
AS7-4357 Upgrade HttpClient & HttpCore to 4.2.1
setting separated jboss cmp metadata, using unique jdbc table names
AS7-4784 - introduce AbstractAttributeBuilder
add backward binary compatibility
AS7-5427 Add support for custom attribute marshallers
AS7-5427 Add support for custom attribute marshallers
AS7-4857 correct JPA dependency injection (stop injecting javassist and let Hibernate include envers).
AS7-5451 Remove runtime use of the deployment unit
Initial implementation of inter-deployment dependencies
Remove passive phase notion to simplify things
don't mention jboss-jpa.xml deployment descriptor in jboss-jpa_1_0.xsd
[AS7-4944] update managed server registration process
Configure the shared subsystem endpoint based on the remoting subsystem
Startup scripts ergonomics
Revert "AS7-4857 correct JPA dependency injection (stop injecting javassist and let Hibernate include envers)."

This reverts commit 8dd51701e683c718f692c58ad99e9de49e379b58.
MDL-30210 Fix broken web service unit tests
<input type="range"> polyfill update
Merge pull request #5525 from fabi1cazenave/input-range

<input type="range"> polyfill update
Auto-merge from branch 'master'
Bug 806989 - Implemented new lockscreen for dailer design with SVG
Bug 813045 - TypeError: this.iconContainer is undefined in app://system.gaiamobile.org/js/lockscreen.js
Bug 813385 - New lockscreen arc ends up anchored on a subpixel boundary and results in poor rendering
Merge pull request #6481 from yurenju/issue-806989-part2

Bug 806989 - Implemented new lockscreen for dailer design with SVG
Auto-merge from branch 'master'
remove broken filmstrip from single-photo display mode
Merge pull request #4527 from davidflanagan/killfilmstrip

remove broken filmstrip from single-photo display mode
Fix new tab handling on activity
Use prefix for MozActivity
Dont create duplicate tabs on startup (merge error)
Merge pull request #2818 from daleharvey/activities-fixes

Activities fixes
Fix a race when the activities list menu is opened
Merge pull request #4705 from vingtetun/activities-click

Fix a race when the activities list menu is opened
Fix keyboard on/off transition reorganize KeyboardManager
keyboard/keyboard_manager.js -> keyboard_manager.js
Merge branch 'master' into kbmanager-fix

Conflicts:
	apps/system/style/system.css
Merge with upstream
Lint fixing
Merge pull request #1615 from vingtetun/keyboard

Fix pull #1609
Grouping of recent calls per day and per contact + filtering of calls (all vs. missed ones).
Inclusion of comments to pull request ;-)
Inclusion of further comments to the pull request ;-)
Merge pull request #2412 from gtorodelvalle/feature-dialer-call-log-filtering

Grouping of recent calls per day and per contact + filtering of calls
[SMS] shouldn't try to send a message without a recipient r=fcampo
Merge pull request #6923 from borjasalguero/bug_819898

[Bug 819898] [SMS] shouldn't try to send a message without a recipient
bug 808892: add placeholder in device info section
fields need to be fill out:
Software, Last Updated, Firmware Revision.
Merge pull request #6449 from evelynhung/issue-808892

bug 808892: add placeholder in device info section
Fix highlighting awesomebar with multiple results (fixes #2759)
Merge pull request #2774 from daleharvey/fix-awesomescreen

Fix highlighting awesomebar with multiple results (fixes #2759)
removed hacky ?foo fix
Fix loading sequence issues affecting localisation
start of a work in progress, porting over and cleaning up the paypal api
pin verification is a real resource (bug 807537)
Removed files missed in last commit
Plays and tasks now yell when they see parameters they do not understand, so that typos like 'var' for 'vars'
don't result in people having to ask questions about what is wrong with their playbook
changed method for including bootstrap library files
label for new albums (released this year)
added twigstring and new twig extension to render comments as twig templates
Switch from TERM=xterm-256color to screen-256color.
Add .tmux.conf.
Make sure ido-restrict-to-dired-buffers actually works.
More work on a full blown TCPServer mechanism (added PollerPool and TCPClient)
Added new Reason structure for config stats. Pulled all data publishing out of MotionPattern and into AsyncTask
view results by competitor; show ratings on ladder
private emulation added
Cleanup after tests.
Removing previous pages on pagehide event
many many responsiveness fixes
Added zip and zero size check
much to do

still need to start arc and spin
update version for 0.8 release
pretend B2G Prosthesis is compatible with Firefox to satisfy AMO validator
Merge pull request #146 from mykmelez/version-0.8

Version 0.8
Allow for box-shadow to be specified
Styles are now auto-generated
Stop removing box shadow
updated logger.pl to work with strict
compile fixes...
mouse off options
turned review to default
add plugin : mru.vim --- open recent opened files
Update Version 2.0.23.4-SNAPSHOT
Update Version 2.0.23.28-SNAPSHOT
fixed getting index when failed to create a record
enq_pages
some form of 3d working
forgot to add new tests, previously
update tests
clasificación final
nla_love_v0.2
Reorganize Configuration file in sections. More consistent layout. Clarify the role and scope of shinken-specific.cfg. Organize the file in a ordered manner. Clearer comments. Typo corrections.
Left to order the modules, check that there are no missing modules in the daemon lists and apply the same to the other configuration files.
Readme.md aesthetic changes
Image link was added
only apply enable message timeouts to spouts
Consul half done
created an active defense mod and a passive defense mod
implemented Essedum
fixed active/passive defense mod
Fixed get and Swap cards - a lot nicer now.
Done some work on creating test cases
Consul activation implemented
Added cancel to filtered List
Merge remote-tracking branch 'origin/master' into master21

Conflicts:
	src/Roma/PlayerInterfaceFiles/TestingPlayerInterface.java
add caprc with notification and capistrano_colors
add some java config
update Math example
added support for definitions and device resolution
Merge pull request #1 from ecarter/master

support for definitions and device resolutions
Embed getBoundsHeader function in the mapsAgent for more readability
Update to 0.9.0.RC3
FIX #39 and add optional silent kwarg
Created a new Phing task for creating releaselog files.
Remove bash git completion script
cleaned up unneccessary comment
Committing Pom versions for Release 1.8.M07ENG1
Committing Pom versions for 1.8-SNAPSHOT
initial commit: chap03~chap05
Moved default LDAP options to be set right after initial connection
redundant data folder removed
zoom meta added
fixed setting limits on left and right axes
front end for financial statistics, in-app purchases (bug 755448)
ensure app statistics are hidden for non-public/pending apps (bug 753176)
Removed ruby 1.8.7 from travis config
Modificación para probar los commits
Pequeñas modificaciones
Ignore List
CB Gamma Demo
Add method
Add YARD
SPAllocator: fixed generation of break assignments for SPs
MiniTest setup
When deleting chords through notes replace with rest
Change dirty tree character
Changes in OcciRestCompute.java - Adding mixinx and links
Add an "inspect" command to ptrie-tester.

The "inspect" command prints the tree nodes in breadth-first order as well
as the "disk" layout for the nodes.
Added forgot password dj feature
add vs2008 setting
add VAssit-v10.6.1862 conf

Signed-off-by: yftx <yftx.net@gmail.com>
Allow to specify level in ion_navigationTree helper
When not a tty, don't output escape sequences
fixed bug on refreshed playlist
Added IsDefault<T>() Object extension.
Modify order of parameters for commands callbacks.
Add an example for directly using connection instances.
Use implicit event loop in most examples.
Bump VERSION.

Yet again, no tagged release.
Merci is now a blog post.
Move sponsors to bottom page.
Small style modif on blog page.
Improve merci.
Improve what page.
post annonce programme.
Sponsor tisséo text.
p2 signup form checks all fields
Fixing name of templates controller.
doc templates updated and adapted to new (planned) home
[minor] semicolon all the things
Ditch NBT use in favor of Bukkit's new ItemMeta APIs
add newline under readme title
img is not an encapsulating tag
++doctype
++charset
work on badge table and assertion rendering
Meu nome - é nóis na fita!
Vamos testar as linhas
Será que você consegue ler isso?
bom, legal então...
Abraços e bom trabalho!
Pedro Passos
Merge branch 'master' of http://github.com/oiteam/cpi-teste
working raw kludge
Fix up newere form and api tests.
Correct file permission changes.
Publisher tree on publisher read page uses jstree now (I left arrow the version for comparison). Fixed publisher search box typeahead select action and css. Revamped licence display.
NuGet.configの変更は不要になったようなので削除
v2.2.0に更新
Readmeの更新

Nugetrestore.ps1の説明を削除
フォルダ構成例を追記
PowerShell設定の補足として@ITのリンクを追記
packagesフォルダがないとプロジェクトフォルダ以下をバルスしてしまうバグを修正
Correct single record deletion from tab
close preview on done
Trigger email password reset message
landing page minitabs
[IPLUG] removed some commented out stuff from an old attempt to put the plugin version number in the plug-in state
[IPLUG] rework of Serialize methods. Now plugin implementation classes should only implement Un/SerializeState and call Un/SerializeParams at the end of the method when supporting chunks. No need to implement Un/SerializeParams
[IPLUG/AU] simplification of Get/SetState methods, which only need to call Un/SerializeState now
[IPLUG/VST3] should work with chunks based plugins now
[IPLUG/EXAMPLES] chunks example reworked
[IPLUG/VST] commented out a call to _this->ModifyCurrentPreset() in effGetChunk, which was causing the initial preset to get over-written in chunks plug-ins
[IPLUG/RTAS] fixed loading of default preset
[IPLUG] notes about MakePreset() etc usage with chunks
[IPLUG/EXAMPLES] RestorePreset(0) added at end of IPlugChunks constructor to initialise state
Revert "[IPLUG/RTAS] fixed loading of default preset"

This reverts commit 5fe731c47712da8409af608367b9fe13f2397cbf.
[IPLUG] Force Carbon non-composited windows to redraw everything, and remove double call to IGraphics::IsDirty(), which would cause problems with USE_IDLE_CALLS defined

I noticed with the IPlugChunks example in non-composited carbon windows, only one control would draw at a time. It should be possible to only redraw a particular region of the gui (the dirty control), but so far all attempts failed. For now just redraw everything.
[IPLUG] added a missing call to DisposeRgn() which may have caused a memory leak in non-composited carbon
[IPLUG/RTAS] fix for x offset of mouse messages when plug-in gui smaller than the minimum width of the PT host window
[IPLUG] moved some functions for putting IPlug version numbers into chunks to IPlugBase, rather than IPlugVST, so that they can be used by the fxp/fxb loading/saving methods in IPlugBase
[IPLUG] updated fxp/fxb loading/saving methods to work with plugins that do chunks
[IPLUG/EXAMPLES] updated chunks example to have a fxp/fxb save popup menu, also to initialise chunk data "manually" rather than calling RestorePreset(0) at end of constructor
[IPLUG] fix TRACER builds on 64 bit OSX
todo.txt
[IPLUG] ignore deprecated warnings in IGraphicsMac.mm
[IPLUG] whitespace
Fixed symlinks for zsh.
QuadTree module
Gemfile: termcolorの要求バージョンを '< 1.2.2' に

termcolor1.2.2 からアロー演算子を使うようになって Ruby1.8.7 で動かなくなったため
document_table.rb: addするとnegative string size (or size too big) (ArgumentError)となる問題を修正 (thanks azurite)

ファイルサイズが大きすぎてKconv#kconvに失敗した時は無変換のままデータベースに登録するように
検索速度の事を考えると登録しない方がいいのかもしれない
MOAR formatting fixes
Fixed rendering to canvas
message for too many items in trashbin and deny copying of big folders
Initial commit to Git of export from Subversion from r48835
Merge branch 'master' of git://github.com/openGDA/gda-libs

* 'master' of git://github.com/openGDA/gda-libs:
  Update to mirror subversion as of r48703 2012-06-18 14:31:10 +0100 (Mon, 18 Jun 2012)
  Update to mirror subversion as of r47746 2012-03-21 17:04:40 +0000 (Wed, 21 Mar 2012)
- fix wrong logic
More bad commas
GEOT-4263 TimeParser in ImageMosaic is too lenient
Merge branch 'master' of git://github.com/geotools/geotools
Release connection correctly after borrowing it for handleVisitor implementation, see GEOT-4193

Signed-off-by: Jody Garnett <jody.garnett@gmail.com>
Merge pull request #2 from jive/visitorConnectionRelease

Release connection correctly after borrowing it for handleVisitor implem...
wording - storymap to mapstory
adding a gitignore and updating README
updating README
adding local plugin to gitignore
testing IRC post and trying to ignore run_install
updating version
dealing with plugin dir
setting up an empty plugins dir
fixing up a default local plugins dir
Adding etc and bin empty dirs
Removing run_install file and adding ability to add ?runinstall=y to the url to invoke the installer.  This gives more options for git based installes and still allows a tarball or package based install function with the run_install file available.
Updating README file
Delete old readme
Updating README
Fix broken lists of interfaces that have shared hosts.
Fix for initial install state from github download
allow quick find of free ips to work with /31 and /32 subnets
Merge branch 'master' into ona-ipv6

Conflicts:
	VERSION
	www/winc/search_results_qf.inc.php
BC: More transcript work. Needs a lotta love.
Update notes for submitted changes

* Port nova-rootwrap changes to cinder-rootwrap
Make cooperative reader always support read()

glance.common.utils.CooperativeReader provides eventlet-friendly
cooperation on top of backends that support either read() or __iter__().
However, in the case of backends that only support __iter__(), such as
images returned by store.get(...), read() is not defined. This patch
adds read() in all cases.

Fixes bug 1057322.

Change-Id: I67d9b3e4d93fbefd7eeaf7cfc947ab635fe09534
Merge "Make cooperative reader always support read()"
DocumentsItemPart return also part_title
change bg picture to transparent bg
pretty login page with hippo
Update beers coffee events
Try to fix JNI memory leak
Committed translation (cs).
Committed translation (ka).
MemoPlayer android: removed @override for fixed orientation
Added syntax highlighting to the search results page.
Merge branch 'master' of git://github.com/otac0n/WebGitNet
Added filenames and links to diff view.
Support for added, deleted, renamed, and copied files to the View Commit page.
Fixed image previews.
マルチブラウザ対応(笑)
Created Logon & Register Partials
added licence
added Makefile
initial version
added tests for utils
updated Makefile
added DNS lookup
added downloadinf robots.txt
added downloadinf robots.txt
added handling sitemaps in robots.txt and feafult sitemap.xml
Explain why test isn't being run.
Devia ter feito um Branch
added MOOS-to-ROS package to ROSinstall
Lowered ore gen rates. Fixed armour.
travis yaml fix up
added qrcode_data dat files on installation
User welcome page
Set mouse-drag-copy-region t
挖回原来的后台代码 待调整

Signed-off-by: paperen <paperen@gmail.com>
Tweaking sort order.
sorry, no copyright for TUBITAK/UEKAE
pisi-index güncellendi..
Enable dynamic audio compressor

* Fix clipping for sound+speech+music cases
Updated requirements.txt for django 1.4
Fixed analysis_manager to use updated file_store.import_file function
Cosmetic modification, makes it so there's no hanging colon
Multiple IGV links including sample information for ordering in IGV.

Also includes spinner while waiting for session and sample information files to be created.
Class-specific default tag for create_xml()
Add standard_tag everywhere.
First bits of aconf.
Add standard_tag to atompub.
Merge posts into entries attribute of AmesFeed.
One ThrMixin to rule them all.
Minor fixes.
Add instructions for running the develsite.
jill: tidying for timeline story #62, #68
Added null check to link function, for linking when container selector does
not match any DOM nodes. (https://github.com/BorisMoore/jsviews/issues/51).
Major update. Data linking to select elements, radio buttons, check boxes
now fully supported. Some breaking API changes. This commit brings JsViews
APIs a lot closer to the planned design for the beta release. with more
consistency between the link method of JsViews and the render method of JsRender.
See demo examples for usage of the modified APIs.
Added support for data-linking to textarea elements (https://github.com/BorisMoore/jsviews/issues/2)
Improved sample for form elements, and included textarea example.
http://borismoore.github.com/jsviews/demos/step-by-step/07_form-elements.html
Integrated updated design for #index, from JsRender.
Signed-off-by: Boris Moore <borismoore@gmail.com>
Bug fixes for JsViews integration - onRender, including issue 64 and 65.
Added support for chaining from a link call - which now returns the jQuery
object containing the linked container element, allowing binding of event
handlers, calling find(selector), etc. on the newly rendered and linked content.
Fix for issue 67 - view.render() and related bug on view.remove()
Fix for issue 68
direct draw clear_screen and write methods added.
Add draw_line(), goto_rc() methods.
Add version number generation to Makefile.
add evaluator logic
updating pd invocation
Adapted current IP utility and implementation to InetAddress.
Added google analytics
Added Twitter Support
Fixup for 409d2f
1808: Correct way to get the video title
1731: User dashboard: add messages, tweak styling
Restore ordering on tasks page.

Broke when the queries were split. This fix appears to work, and
doesn't seem to have an appreciable impact on number or duration
of queries. @sjl should review though, just to be sure.

https://unisubs.sifterapp.com/issue/1180
Fixed profile views tests
Fix test to assert we redirect to the right page
Merge branch 'staging' into dev
1603: Need to actually limit the number of videos returned
Update support links
Merge branch 'staging' of github.com:pculture/unisubs into staging
Reverted test runner commented out by mistake, sorry folks
Removed production app servers pcf-us-cluster{6,7}
Merge branch 'production' into staging
Ignoring temp files generated by Kate
Bugfix for sniffer not being stopped when the analysis process raised an exception
add more information to FileGraph
add more information to RequestInfo
making FileGraphFactory and FileMessagingTarget more consistent
added more information to BDBKeyValueStore
added more information to PropertiesKeyValueStore
improvements to DebugEndpointServletInterceptor
added javadoc
improvements to DebugEndpointServletInterceptor
introducing XriResolutionEndpointServletInterceptor
fixed backup script output
Merge branch 'bol'
updated config for real dns name
IST-76, fixed address display on bol
IST-76, change bol popup headers
Merge branch 'master' into bol
Fixes a bug in the rollup procedure where null values were not counted when building the dataset of the resulting segment.
- Added the 'expect' API in the header file.
- Removed the 'python' TODO item (done)
add flymake recipe that tracks the new and maintained fork

remove features
Make config packs work on linux by fixing unicode problems
Cope with trailing CIGAR H (or S and H) in 'samtools depad'
clarify some steps
Add programming for press
Make minor update to announements
Regenerating phalcon.c [ci skip]
centerMarker
Update composer.json

Change namespace as this is a fork
Finish exceptions cleanup
Add Elastica_Filter_GeoDistance::setDistanceType()
Fix yet more leaks in services/dvr.cpp. Objects allocated on the heap when they could/should have been on the stack.
A RecordingRule is owned by it's RecordingInfo and should not be free'd elsewhere.
FFmpeg resync to SHA1:cc4d80c99ff3169b71c62691d5c7602ef673c3dc

No conflict
Revert "Disable use of kDecodeLowRes, see libav bug 297."

This reverts commit 3bb150c7b05373231539fe556b61675aecab974a.

FFmpeg re-added lowres support. Cf: https://ffmpeg.org/trac/ffmpeg/ticket/1351
Apply fix from 139a98e45d5d5d907390 in correct area.
Don't check m_statusText for NULL it's redundant and confuses Coverity.
Cleanup OSD::DialogShow(), this code had the potential to segfault if the theme was missing a dialogue definition.
Refs #10311. Port UPNP code from RefCounted to ReferenceCounter.
Refs #10311. Add additional debugging capabilities to ReferenceCounter.

The original ReferenceCounter class would print out the QObject's objectName().
I didn't implement this when I rewrote ReferenceCounter as a general purpose
reference counter. But having a name for an object does aid in debugging, this
reintroduces that idea but with a QString passed into the constructor. By
default this is not enabled, but if you need to debug reference counting
enabling it is just a matter of uncommenting a "//#define EXTRA_DEBUG" in
the header and recompiling.
Comment additional missed line in e47bcd4955.
FFmpeg resync to SHA1:f218121a4d79f9aab45526f3d1655ec2cc8de0d1

http://git.videolan.org/?p=ffmpeg.git;a=log;h=f218121a4d79f9aab45526f3d1655ec2cc8de0d1

No conflict
Loosen test for initial stream alignment before prefetch. We could otherwise end up with a stream with no segment left. So we ensure there's always at least one.

This is required for HLS streams where the backup streams don't match at all (e.g. France24 stream)
Remove avformat_network_init() not called warning.

Make sure avformat_network_init() is called before ffurl_open is ever called.
Internet Content: Fix Vimeo grabber

Vimeo now requires that oauth_callback is specified.  We set it to out-of-band
since we don't use it.
Subtitles: Add a leading space to teletext subtitle backgrounds.

This is according to the spec.
Subtitles: Only display teletext captions inside the "box" area.

The spec says that characters outside the "Start Box" / "End Box"
region should not be displayed.  Refs #10678.
Rename files to have more consistent naming scheme between all new FFmpeg files
Ensure no modification to FFmpeg libavformat's URLProtocol change would break our code

FFmpeg's recently changed the structure of the URLProtocol object, which broke our code.
While this time it caused a compilation error and was easy to spot, it could have changed in such a way that it would have compiled properly and cause runtime crash.

C++ doesn't have C99 designated initialisers, so do it another way. Clean up avfringbuffer while at it
Add Hall type audio upmixing.

For stereo content: left is sent to left channels, right to right channels and a slight bias to center channel. Power levels are kept the same from original content.

Re-enable passive audio upmixing, old code was incorrect

Fixes #10751
Remove trailing whitespace in mythfreesurround
chrome windows query builder bug
icons for the query builder buttons
adding GripDragComponent that only activates drag operations on a specific sub-component
links instead of buttons
make the icons bigger and update tutorial
Merge branch 'querybuilderfixes'
terminology
bad writing
findbugs warnings
new query builder in user guide

Signed-off-by: Thomas Krause <thomas@berlin-reloaded.de>
more new screen shots for user guide
 new screenshots again
download annis instead of compiling it
cleaning up documentation
make html documentation look better with the icons
update to vaadin 6.8.5 and add some first context help
context
add help for exporter
"Segmentation Layers" -> "Base text"
downgrade to Vaadin 6.8.4 since the global execute query shortcut did not work any longer
Make sure there is a space for the first sentence in a paragraph, before highlighting
Remove letter ahead for keywords
Remove letter ahead for keywords
modified:   README.md
	new file:   knap-sa.py
	new file:   knap_40.inst.dat
	new file:   knap_40.sol.dat
	new file:   pic3.png
Revert "DEBUG add function to set debug fd"

We will have a completely different debugging framework soon.

This reverts commit ec46d6fa43e33d3cc943fc28d09045a006eb4bac.
developing the wt downloader
Added a transform1d func
- using jquery.simplemodal plugin for dialog
Merge branch 'develop'
Merge branch 'develop'
Minor fixes

starting
Introduction and images.
Delete old images.
Minor changes to fabfile.
Section 1 - The problem stair.
Add Netlib Readme to references.
Full review.
Update the notebooks.
Add two new examples.
Clean up the project.

- Improve the document.
- Check the units in the numeric examples.
- Minor format modifications.
Merge branch 'master' into develop
fixed crosshairs on matrix
[redis-reconnect] Sensu::Redis, server stops when redis connection lost, api reconnects
[redis-reconnect] subdue_type -> subdue_at
[redis-reconnect] improve redis error handling
[redis-reconnect] simple reconnect!
Merge pull request #312 from portertech/redis-reconnect

[redis-reconnect] Sensu::Redis, server stops gracefully when redis connection is lost
Add User documentation
Add POST /authorize

POST /authorize is used by ios client to authorize users singed with
facebook library

Parameters:

 * token
   access token from facebook auth process
 * uid
   facebook user id
Merge branch 'release/0.6.53' into develop
Fix announcement margin
bump version number to 0.6.54
Merge branch 'release/0.6.54'
Configuration for CZ and RS.
No network in configuration = don't check proper network.
Integration tests, brought back node expansion... need to clean that stuff up.
Some road refs for CZ.
adding wax
restore config.js
fixed defaults in stack view.
simplified defaults for push/ pop stacks.
initial commit.
fix whitespaces.
add .gitignore.
fix driver project file in order to also perform debug build.
convert solution and project files to VS2010.
support windows 7.
remove configurable tor exe path, its not yet working anyways
Update the output to handle new tracing.
Removes build directory from configuration
Fix missing use statement. Closes #515
Polly is handling cross-browser vertical & horizontal StackPanel alignment, and cross-axis alignments for vertical StackPanel.  cross-axis for horizontal SP next...
Finally checking in some improvements to Mutt.
Added functions for filtering data. Still a beta version.
Point at external pile
Update installation instructions
Updated installation instructions
Replace contacts block with Twitter button
reset pc motion after move
_str_replace : free some leaks
remove pid files for vassals
TINYMCE_JS_URL fixed
#340 fixed, expression of requesting_till date tweaked
added participants page frame
added entry navigation to the participant page
[FEATURE] implement title() expression
Fixed comments only
Merge branch 'master' of github.com:qgis/Quantum-GIS
Merge branch 'master' of github.com:qgis/Quantum-GIS
Merge branch 'master' of github.com:qgis/Quantum-GIS
In progress support for retrieval of html composer and items by id from map composition. Also refactoring python composer tests.
Merge branch 'master' of github.com:timlinux/Quantum-GIS
Added bindings for getting an item by id and a composerhtml instance that belongs to an item.
Merge branch 'master' of github.com:qgis/Quantum-GIS
Further refactoring of composer html tests and fixes so that html elements consume all horizontal space
Merge branch 'master' of github.com:qgis/Quantum-GIS
Better test html table
Merge branch 'master' of github.com:qgis/Quantum-GIS
Fixes for fetching a CompositionHtml from a Composition
Test new ComposerHtml accessor method and fixes for other tests.
Resolved merge conflicts with origin master
Mark composer html multiframe test as expected to fail for now
Merge branch 'master' of github.com:qgis/Quantum-GIS
Reinstate symbol layer registry sip stuff
Added missing sys import
add PROJ.4 version to about dialog
- various changes and bugfixes to QgsCptCityArchive and QgsCptCityColorRampV2

UI changes:
 - view color ramps in separate list widgets, with qsplitter
 - draw stippled (check-board) background for ramps with transparency
 - save / restore geometry and layout
 - separate preview and info with tab widget
style manager : cosmetic changes (wider icons, splitter with save/restore, changed buttons appearance, add menu icon) and use menu instead of dialog to select new color ramp type
Merge branch 'master' of github.com:qgis/Quantum-GIS
fix crashes using uninitialized geometries with GEOS functions,
ensure geos geometries are up to date when passed to GEOS functions
Modified 'Epic' irssi theme.
Merge branch 'master' of https://github.com/qmanjr5/dotfiles
README reflects more common focus of this repo
Konfiguracja wydzielona do osobnego pliku
Skrypt instalacyjny, domyślna spawdzaczka, README
++numerek wersji
Wiki updates.
Merge branch 'master' of https://github.com/quincy/vimconfig

Conflicts:
	wikis/my_wiki/Passwords.wiki
Removing passwords from version control.
update
nm,.
update the reg validate

Signed-off-by: 525846028 <525846028@qq.com>
add 2 new logos: 1 with new narwhal alone; 1 with new narwhal & sponsored by Rackspace
Organização das imagens em uma pasta separada
Modified CSS Aug 8th 8.33
add failed example
removed inherited resources completely and switched to basic responders
Ajout [Projet: Droits Utilisateurs]
Update observatory/templates/rcos/students.html
yea finally fixed
Fix "Commands Only" chat flag. Fixes BUKKIT-2238

Thanks for the commit @mrapple
Add the ability to launch WitherSkulls. Fixes BUKKIT-3106
Use shooter constructor for Fireballs. Fixes BUKKIT-3121

Fixes fireballs exploding in the shooter's face and not having a shooter for the projectile. (Two birds with one stone!)
Provide a faster way to get a location. Adds BUKKIT-3120

Currently when a plugin wants to get the location of something it calls
getLocation() which returns a new Location object. In some scenarios this
can cause enough object creation/destruction churn to be a significant
overhead. For this cases we add a method that updates a provided Location
object so there is no object creation done. This allows well written code
to work on several locations with only a single Location object getting
created.

Providing a more efficient way to set a location was also looked at but
the current solution is the fastest we can provide. You are not required
to create a new Location object every time you want to set something's
location so, with proper design, you can set locations with only a single
Location object being created.
Update entity state correctly when marked as persistent. Fixes BUKKIT-3123

When a mob is marked with the persistent flag (animal or anything with
setRemoveWhenFarAway(false)) the entire block of code for checking if they
should be despawned is skipped. However, one part of this code updates the
mob state if a player is close enough to them. It turns out this state is
used by the AI system to decide if the mob should move around randomly or
not. To stop mobs from being frozen in place we now update this state if
the persistent flag is set as well.
Correctly shoot arrows with the spawnArrow Method. Fixes BUKKIT-3116
[Bleeding] Fix NPE in getBedSpawnLocation. Fixes BUKKIT-1949
Add SlotFurnaceResult for diff visibility
Implement FurnaceExtractEvent. Adds BUKKIT-2114
Add isSolid() tests for each material
[Bleeding] Fix NPE with a null bedSpawnLocation. Fixes BUKKIT-1500
Pass null help values values as empty strings to HelpTopics

Fixes BUKKIT-2618 and BUKKIT-2561
Only display help aliases when there are aliases. Fixes BUKKIT-1621
[Bleeding] Correct getEyeHeight value. Fixes BUKKIT-3130
Merge remote-tracking branch 'upstream/master'

Conflicts:
	pom.xml
tweaked display of scratchpad, added it to student view
fix NullPointerException in CameraNewService.isAutoFocusSupported and CameraSemiService.isAutoFocusSupported
final fix for space isssue
add gitignore
add methods for colorization
"build_tweet" method

method for making tweet info. returned value is used as tweet line in
prompt.
色コード修正と build_tweet のリファクタリング

 1.dark_yellow のコードを修正
 2.保存する情報を考慮して build_tweet メソッドを修正
refactoring method to colorize, build_tweet, Ruby 1.8 support
method to classify tweet and some refactoring
make code's logic simple with getting a timestamp in advance.
add remote changes
TAK demuxer and decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
wip

Signed-off-by: Paul B Mahol <onemda@gmail.com>
makes the linter output to the proper xml schema
add net-dialup and mentohust-9999
rename sync entries only in remoteop_rename()
rhc-accept-node no longer passes with the changes we made.
250 words. Marla awakens beneath a tree. It is raining.
Added committed txn count.
Merge branch 'master' of github.com:rmmcnulty9/myPTM
Update views/index.php
remove smoketests and boto
don't need these pips
Removing the plugins directory
Merge pull request #9 from anotherjesse/master

remove boto and smoketests
Merge pull request #10 from rnirmal/remove_plugins

Removing the plugins directory
mailmap for dean
Merge pull request #11 from anotherjesse/master

mailmap for dean
add chance scheduler back
Merge pull request #12 from anotherjesse/master

simple inherits from chance
remove ec2 mapping
pep8
remove old nova fakes
Merge pull request #13 from anotherjesse/master

remove ec2 mapping (it will happen in nova)
remove non-volume from policy.json
Merge pull request #14 from anotherjesse/removal

remove nova fakes & trim policy.json
First pages commit
First page announce
added handling of missing imaging library
fixed missing parameter bug in join()

if a parameter was missing in one of the datamats, then it would simply
be copied over from the other. this isn't desired. now it's promoted to
a field and treated just like mismatched fields
Merge branch 'master' of github.com:robertmuil/ocupy
Fix in the config file
Replace missed highlight tags with the Markdown-like syntax

My bad, my script use a regex that doesn't match some languages
Remove unsupported formatter for Pygments.rb

Replace django+jinja with jinja and txt by nothing
Add the "tables" option to the Redcarpet's extensions list
Changed name to Synote Discussion
Merge branch 'master' of github.com:robsws/gdpgroup9
makePackage script checks for directory presence
Some improvements for heroku
Coloca send grid de volta com api key.
Basic User Model
Merge pull request #2 from roicp/users

Basic User Model
Editable table fields

Woot!
Add fb screenshot metatag
Ignoring accidental .class files occuring outside of target
cambio a los links de lenguages
Make NamedBootstrapContext::setName public
AS7-4748: Update to console 1.3.1 (relates to AS7-4739)
JBPAPP-8921 Fix SessionContext.wasCancelCalled() when no asyn invocation is in progress
Adding test of SessionContext.wasCancelCalled() on not asynchronous business method
JBPAPP-8921 Remove @Ignore from the test
Remove unused class
AS7-4563 default-cache is not actually a required attribute
[AS7-4563] Make default-cache optional in the xsd
[AS7-4754] Even in silent mode the console is required so that error messages can be displayed.

Otherwise we just silently end with no indication of the failure.
[AS7-4705] missing registered management operations

* add a runtime_only flag when registering Topic and Queue
  management operations so that they are also available in domain mode
  (under the /host=XXX/server=YYY/subsystem=messaging/ subtree)
AS7-4733 Do fix correctly, plus explain (a bit) when the missing dependency is an unknown transitive one
AS7-4755 Don't try to connect to remote nodes if the local EJB receiver is backed by the default EJB client context, which doesn't have relevant connection configurations
AS7-4739 Handle '-' as separator; don't fail on invalid locale formats
AS7-4758 Pass locale to recursive description read ops
Fix for windows test failure
Prepare 7.1.2.Final
Next is 7.2.0.Alpha1
clean up package.xml files
level 1 marker
Speeding up query
Prerender icon
better style dialog
XMLRPC: Add support for Feature Images to the new wp.xxxPost apis. See #18429 props maxcutler and markoheijen.


git-svn-id: http://core.svn.wordpress.org/trunk@20270 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Adding Introductions stuff
Merge branch 'gh-pages' of github.com:rpruim/PREP-2012 into gh-pages
pull mygrnuplot.sh contents into a tmp file for runtime execution (and delete on jvm close)
Added 'mvs' as alias for mvim app.rb.
RebbitMQ added
Fixed csv/parser/impl/CsvToDatabaseSyncer.java
Integrated upper/ lower distribution update via IVoteAnalysis.java
Created analysis page and model for respective access.
Provided csv file for to initially fill divisor table
Re-arranged query files in order to persist nominal seat amounts per party (relevant for overhand mandates); Create respectively required table
Initial commit
Merge branch 'master' of https://github.com/rykugur/dotfiles
Added font-awesome
Got new match request working
Filled out requests and route transitions to work
foo
finish chapter 9
code cleanup, ui fixes
add current snapshot file.
courserank changes
forgot to return the id on delete ...
storing listeners in an array
added extensionId to the interfaces
Updated framework from BaseWeb by @sebnitu
TEST check that we can replace internal calls in moka_mod_utils
DOC fix moka_mod_utils:replace_remote_calls documentation
FUNCT function to replace internal calls

With this we can simulate that we change the behaviour of a internal function
поставил правильные коридоры в драма функции
gradle1.1化
test
test
test
test
test
Test change
patmos: restructure fetch - branch is broken now
Initial add. Rainbow bars.
Fixed score text bug; fixed left boundary bug; fixed Bar.hitTest bug
Randomizes the order of the bars and dragging/replacing is fully supported; keeps score count too
Fixed a score bug; quicksort function added but it doesn't count the swaps correctly...
Fix 'window is not defined' error occurring in Node.js
* see https://github.com/twitter/twitter-text-js/pull/34 for a reference
Merge pull request #5 from zappan/master

Fixing is-js crashing in Node.js on a window object
make completer closure into a class method
remember history between repl sessions
Added new external methods.
Started some polyhedrons.
Added some methods.
contacts_fixes
vim: add .gvimrc
Only allow br in texts
Añadido el ejemplo de syncadaptar qe ya autentifica contra rutino-server
Swapping version of snipmate vim plugin
styles, view
Signed-off-by:Oleg <seyferseed@mail.ru>
added tests and some refactoring

modified:   js/sunflower.dom.js
modified:   js/sunflower.js
modified:   js/sunflower.test.js
modified:   t/sunflower.dom.js
modified:   t/sunflower.test.js
Обобщен функционал поиска по категориям
aumentando tamanho memoria php
removed libcheck.dll
fix Dom renameNode document/node comparison issue
make deallocation more robust, recognise optional exception
print talk title
strip whitespace
add talk title
Minor edits to assertname location for fail reporting to xml.
Use user lookup instead.
Version bump.
Moving admins/sessions to admin/sessions
First Release
Release
A few fixes
some ui change
Mirror bitbucket/github testing.
Add some more content in my web application.
ammeneded css changed name of team.php to correct name search-mentor.php. ammended search-mentor.php for footer. need to make apply button
add some tesing
Initial commit with truncated history
ignore one more exception for python and added a django.vim submodule
merge
lots of playing around with colors; move bash_custom before bashrc
新增检测ezk是否已经启动，否则启动再执行对zookeeper的操作。
增加clusterConfig，作为cluster的描述。
增加cluster的逻辑。
新增sardine_submitter负责部署topology到zookeeper以及一些准备工作。
ex
roll back to original parsing cuz IE fails to transform xml with xslt
Fix it so worn/wielded items are un worn/wielded if dested.

Kent
Fixed the scan command so it doesn't error if you try to scan an
object that doesn't have an inventory.

Kent
Tweak scan command so it reports same message for empty
objects (as objects that can't hold inventory).

Kent
Some more work on rsay.  It still needs work but closer now.

Kent
Fix the rsay command so it works mostly...

Kent
Hopefully final check method edit. Check method search from principal root to principal leaf. Support method must be implemented
add mattorch
Added .gitinore removing Scott's loved IDE. =)
refactor code to fetch  all users segments, if already fetched it won't try again unless the files are deleted.
Added some more thoughts for Segment Leaderboard Ideas
generating main html ordered by the number of people that have ridden that particular segment
Merge pull request #3 from marcoslopes/master

Generating the final HTML ordered by the number of wot riders that have ridden a segment
Improved Performance of some operations

Replaced quite a few whiles and fors with for-eachs giving a performance gain. Also fixed a few issues with the MySQLDatabase and made several other minor improvements.
v0.8.12.3 - trimmed some unneeded methods, ingame gamemode change with
/pa [] settype
delete group path on close

don't barf if the group isn't empty or the node doesn't exist, though
törzslap 4: additional address fields
master: alternate check for 'already ran' in setup.sh
лайоут
Add easytags and CtrlP
Change pager
Change mapping from Fuzzyfinder to CtrlP
Conky, be quiet!
Remove polkit
fixed some stuff with quoti variables.
Data.Conduit.List.unfold
Attempt to fix OverflowError on Linux
Pointed array parser is working.
removing the colorscheme
modifing vim colorchemes and adding vim-powerline
Caching through APC v1 with apc_exists
Article Header (Metadata styling)
Remove nvm reference.
detrsoy, maxChars, maxCount, allowNotInList, bug : positioning
example for key-value-label items in availableTags array
key-value-label
preceded commit remarks fixed
 https://github.com/baio/tag-it/commit/7f5249072235ca202fe9d6ef86a253c141c078d5#js/tag-it.js-P92
Merge branch 'master' of github.com:baio/tag-it

Conflicts:
	my_example.html
Merge branch 'master' of https://github.com/baio/tag-it
TSIG key generation and zone file entries
batchrender lineisland work
rm no longer used links: GLUT, GLU
added voting system. needs to limit once per person
Merge branch 'master' of https://github.com/ssapra/Qubiculum
Added `partly view timestamp`
implemented `partly view disk-signature`.
Merge branch 'others'
updated the readme.
bump version number -- new command-line options.