labofsahil/github-event-dataset-2012 huggingface dataset:
avfiltergraph: make some functions static.

They are not used outside of avfiltergraph.c
avconv: split checking for active outputs out of transcode().
avconv: split selecting input file out of transcode().
avconv: check output stream recording time before each frame returned from filters

There may be multiple frames returned, so with just one check we can
write more than requested to the output.
avidec: make scale and rate unsigned.

The specs say they are unsigned 32bit integers.
doc/avconv: add some details about the transcoding process.
mpegtsenc: use avio_open_dyn_buf(), zero pointers after freeing

Per suggestion by Michael Niedermayer.

Signed-off-by: Jindřich Makovička <makovick@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
movenc: Write chan atom for all audio tracks in mov mode movies.
ffprobe/flat: add escape for '`' and '$'.
Remove misplaced comment.
Allow colour space autodetection when encoding ljpeg.

This works as expected if the input stream is not yuv4xxp.

Reviewed-by: Paul B Mahol
Do not try to encode DVCPRO HD, it produces broken files.
lavfi/select: add scene detection.

Based on the shotdetect algorithm (http://shotdetect.nonutc.fr/ by Johan
MATHE johan.mathe tremplin-utc.net).
Changelog: add ffprobe flat output.
ffmpeg: remove two unused variables.
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Write chan atom for all audio tracks in mov mode movies.
  mpegtsenc: use avio_open_dyn_buf(), zero pointers after freeing
  doc/avconv: add some details about the transcoding process.
  avidec: make scale and rate unsigned.
  avconv: check output stream recording time before each frame returned from filters
  avconv: split selecting input file out of transcode().
  avconv: split checking for active outputs out of transcode().
  avfiltergraph: make some functions static.

Conflicts:
	ffmpeg.c
	libavfilter/avfiltergraph.c
	libavfilter/internal.h
	libavformat/mpegtsenc.c
	tests/ref/fate/acodec-alac
	tests/ref/fate/acodec-pcm-s16be
	tests/ref/fate/acodec-pcm-s24be
	tests/ref/fate/acodec-pcm-s32be
	tests/ref/fate/acodec-pcm-s8
	tests/ref/lavf/mov

Merged-by: Michael Niedermayer <michaelni@gmx.at>
manually applied jfquestiaux fixes
Fix in admin list model for ammendTable, we weren't setting up
$formModel for getting the form id.
Added setting redirect_content_how session variable in PayPal plugin, so
if run via a content plugin the PayPal redirect will happen normally,
rather than via an AJAX popup (which doesn't seem to work).
Merge branch 'master' of ssh://github.com/Fabrik/fabrik
Removed debug output from joinsToProcess() in list model.
PDF and Overwrite message added to the French language file
removing debug guff
Fix to php_events, had two methods named the same, one should have been
onDeleteRows()
Fix for caneditrow list plugin, so the PHP eval will fire.  We were
short circuiting it, by bailing if no element selected, without checking
for any PHP eval code as well.
codestyle for admin table classes
date element select - now consistent in firing Fabrik and window events whether closed from the date or time picker
Merge branch 'master' of github.com:Fabrik/fabrik
set element hasLabel property to protected
codestyle
fixed: element getValue if elemetn was in repeat group or arepeat element then the default value was overwritten regardless of whether a value was found using FArrayHelper::getNestedValue
changed: css for a.fabrikTip, so that its height is as large as the content it contains. Without this tips were being hidden at the end of the transition
Merge pull request #358 from lcollong/patch-2

PDF and Overwrite message added to the French language file
Closes GH-332 Adding tri-state published icon to cron admin view, with option to reset cron jobs that have failed half way through;
Merge branch 'master' of github.com:Fabrik/fabrik
Closes GH-326
codestyle
removed jquery webcam and old code
updated jquery 1.8.0
updated dependencies
Merge branch 'master' of github.com:Fabryz/mirror
Zip now decompresses "12" = bzip2 as well
Check whether bzdecompress is available
Fixes little border radius issue in user list css
Makes it possible to extend JS delete/toggle action

This is very helpful when you want to have a different effect which is especially needed when dealing with nested lists and deleting a list item with children.
Merge pull request #613 from Gravatronics/enhancement/extendableJSActions

Makes it possible to extend JS delete/toggle action
Merge pull request #612 from Gravatronics/bug/userListColorationMissingLines

Fixes little border radius issue in user list css
Merge pull request #602 from wbbaddons/zipBZ

Zip now decompresses "12" = bzip2 as well
Added methods to receive className and objects

Closes #615
Merge branch 'master' of github.com:WoltLab/WCF
booking tmp
実装中要件 #4,#5,#6,#10: 「マギーってフラダンス踊れるの？」
Better heauristic for detecting closest X-axis component when hovering over the graph.
Added initial level class
Engine core:
The client and server code used to contain hard-coded references / strings to game "DeathMatch".
This obviously causes problems for custom games with different names.

To overcome these problems, this change introduces the new `GameInfoI` interface.

The key idea is to build a list of `GameInfoI`s of all games known (linked) to the executable.
This is done early in application init, so that the list can be queried at the command-line ("--help"),
and a game from it be elected (possibly also at the command-line) for use.

Once the choice is made, the related `GameInfoI` is queried for all subsequent initialization.

References #116.


git-svn-id: https://srv7.svn-repos.de/dev123/projects/cafu/trunk@640 5fe0b3f3-48df-4727-b460-e6dda9226989
Engine core:
Rename some variables with some unfortunate names.


git-svn-id: https://srv7.svn-repos.de/dev123/projects/cafu/trunk@641 5fe0b3f3-48df-4727-b460-e6dda9226989
FBX model loader: Changed code to use latest Autodesk FBX SDK 2013.3 (compatibility API).

References #118.


git-svn-id: https://srv7.svn-repos.de/dev123/projects/cafu/trunk@642 5fe0b3f3-48df-4727-b460-e6dda9226989
FBX model loader: Changed code to use latest Autodesk FBX SDK 2013.3 (new API).

Closes #118.


git-svn-id: https://srv7.svn-repos.de/dev123/projects/cafu/trunk@643 5fe0b3f3-48df-4727-b460-e6dda9226989
Merge remote-tracking branch 'upstream/master'
Moved code from main to a function
Fix errors when CompactRaidFrames are disabled.
An alternative (similar) options framework, may be better for checking that all options are used.
A mostly-working macro-based options framework.
Improved version; only major remaining problem is the one of local vs. global scope.
Small cleanup using the function assign_str
Major rewrite of options handling.

- Use types rather than an int to encode the check behavior
- Avoid usage of eval in quote blocks, this makes assignment local rather
  than global (solving the scope problems that previous versions had)
- Add convert and show methods
- Switch to ht_keyindex for higher performance
- Make sure assign performs substitution as well as append
- Change a few names for increased clarity
Merge branch 'master' into options
Renamed as options.jl
Remove myoptions_test.jl from repository (instead, push to gist).
Remove the old options_strict files.
Switched to isodd() for test of parameter/value list length.
Use interpolation to indicate type, allows generic implementation.
BitArrays now have types (restricted to Integers)

+ the aim is that a BitArray{T} should behave exactly as
  an Array{T} with the same data under all circumstances
+ bitpack/bitunpack functions to convert BitArray <-> Array
+ int() and similar integer functions no longer trigger conversion
  to Arrays; float() and others still do
+ added reinterpret (and bitreinterpret) functions
+ lots of fixes
+ improved tests
bitarray: added cumsum/prod, faster isequal

also fix isbool
fix #688
Added repmat for vectors
Merge branch 'master' of github.com:JuliaLang/julia
close #646. disable flisp NaN tests that block the build for no reason.
bitarray: fixed cumprod return type

also faster cumsum/cumprod
fixing parse of {[a b],[c d]}
Merge branch 'master' of github.com:JuliaLang/julia
bit more work on show(DataFrame)

still needs logic to ignore null rownames and/or colnames
Board.PostArticle (WIP)
reentrable
Added working setup for (Point)Lists
First Commit.
First master commit.
merge
Removed nohup.out
Removed hack from perf test on HoughLines, since I hope it is fixed by pr263
Merge pull request #264 from kirill-kornyakov:remove-hack-from-hough-lines-perf-test
Fix zone delete
Updated tip of the day tips
A few more tip of the day tips added
Merge remote-tracking branch 'origin/master' into vaclav
Extract ModelConstraints api
Remove some deprecated api
Remove some deprecated api + fix compilation
Some clean-up
Extract ReferenceDescriptor from ModelConstraints
ReferenceDescriptor refactoring
Deprecate some classes
Trying to refactor ReferenceDescriptor
Fix compilation
ModelConstraints refactoring
Removed all usages of IOperationContext in constraints
Deprecate IOperationContext in all constraint parts
Add documentation to ModelConstraints class
Implement old methods through new api
Some refinements in ModelConstraints
Some refinements + fix compilation
getScope() use exists parameter
Merge branch 'ttim/no_ioperationcontext_constraints'
build: add dates, bash, MPSPlugin.jar; add buildConnectorPlugin
MPS-16443 Merge drive throws error
Merge remote-tracking branch 'remotes/origin/MPS2.5' into mvtest
Merge branch 'mvtest' into MPS2.5
Merge branch 'MPS2.5'
Fix MPS-16160
Merge branch 'MPS2.5'
Change time precision.
A module docstring.
Honed a test.
FormatterMixin
Formatter.result -> Formatter.result_summary.
Formatter docstrings.
Show failures and errors.
Another small example.
Minor formatting.
test -> example
Stale import
Indent tracebacks.
male zmiany

mam maly problem - nie moge podlozyc grafiki pod przyciski
un bosquejo muy simple para pasar estructuras
kegweb: only show drink duration when available.
core: make default session timeout 3 hours.
Reformated ec.py.
Merge branch 'master' of github.com:KenKundert/ec
rcov requirement
Regenerate gemspec for version
Correción de la ubicación de la institución educativa
Uppdaterat javadoc på guit och ändrat på eventet player_added i tableview
Actually call toString
Added breadcrumb support to character
Excluded template definitions from CodeSniffer ruleset
Modified event display page to use CSS to allow future refactoring
Style check fix
Added handicap system. Fixed !mgehelp, mgemod_dbconfig, and kicked clients not being properly handled.
FIX: compile - modulename
Fix RMagick require
Merge with glenngillen/heatmap
bugfixes
Merge pull request #3 from mapus/master

sync
More game reports
Added environment_variable attribute to location_shortcut tag so that shortcuts in other locations can be specified
Game data updates for #1
New Windows Games:
* Baldur's Gate - GoG only
* Baldur's Gate II - GoG only
* Demon Stone - GoG only
* Dragonshard - GoG only
* Icewind Dale - GoG only
* Icewind Dale II - GoG only
* Temple of Elemental Evil - GoG only
New PS3 Games:
* Final Fantasy XIII-2 - Europe only - Contributed by AdmiringWorm
Updated Windows Games:
* Neverwinter Nights - Added GoG info
Updated XML Exporter for new environment_variable tag on location_shortcut
Added and updated games #1
Merge remote-tracking branch 'upstream/data' into data

Conflicts:
	Data/Data/windows.xml
	Docs/data changelog.txt
Alphabitized #1
Work on #1
New Windows Games:
* Revenge Of The Titans - Steam only - Contributed by AdmiringWorm
New PS3 Games:
* Assassin's Creed: Brotherhood - EUR only - Contributed by AdmiringWorm
* Assassin's Creed: Revelations - EUR only - Contributed by AdmiringWorm
* Flower - EUR only - Contributed by AdmiringWorm
* inFamous - EUR only - Contributed by AdmiringWorm
* Uncharted: Drake's Fortune - EUR only - Contributed by AdmiringWorm
* Valkyria Chronicles - EUR only - Contributed by AdmiringWorm
Update Windows Games:
* CSI: Hard Evidence - Changed to backup CSISaveGame*
*  Driv3r - Removed Uninstall Registry Key
* Fable The Lost Chapters - Added Folder Tattoo to type Tattoo
* Icy Tower 1.5 - Added Report File
* Shaiya - Changed Registry Key to 'HKEY_LOCAL_MACHINE\SOFTWARE\SONOV\Shaiya' and consolidated settings files to *CONFIG.INI
* The Ship - Removed GameUX Registry Key
* Streets Of Moscow - Changed to Camel Case and removed Dublicated settings entry
Merge remote-tracking branch 'upstream/translations' into translations
Removed some comments and updated translation #9
Updated the installer so it's easier to change it in the future.
Example: Change Version in the define section, and it'll change throughout the installer
Fixed typos #9
Fixed some typos.
Changed location of isxdl.dll and gpl-2.0.txt
Merge remote-tracking branch 'origin/installer' into translations
Merge pull request #15 from AdmiringWorm/translations

New Norwegian translation
Updated installer script for easier updating and translating
Limit chat URLs to 100 characters.
experimental/hash

adding primop function calculating hash of a string
(following Eelcos suggestions: test case & disregarding string context)

Signed-off-by: Marc Weber <marco-oweber@gmx.de>
core + modules updates, style updates
add/sub: more addressing stuff
debug: label every instruction in disassembly
clean ./tests and move everyting into ./tests/todo
move some working testcases into ./tests
impl. of (buggy) mul; more debug; testcases
codegen: fix `mul' bug: `edx' will be destroyed by that instruction
index ebp with negative offset

otherwise values in the caller stack will be overwritten, consider `main' vs.
ghc runtime... *facepalm*
more testcases
Implemented clipping path.
Publishing experimental fork.
on expression copy or assignment, recompute size correctly if held by reference
fix types in cover tests for toint and tofloat
deleting units testing old (i)round2even
Most problems related with old (3.2.1) LAPACK version seem solved.

They depended of two bugs in LAPACK 3.2.1 on size queries for svd and schur factoriations.
Doing the alloc "manually" with sufficient (perhaps too large size) solve the problem,
but a version detection it is still needed to insure the use of best allocation values of LAPACK
workspaces when its possible.
still a remaining include of round2even
static fft doesn't work at all with double AVX, making it always use float instead. Fix #345
Initial commit with Connection Counter example
HubConnectionCounter and ServerClock with persistant connection
Added move shape
logic for MoveShape
Working demos with clock, connectioncounter and MoveShape
NOTE:
- Fixed crash caused by user hit ENTER in a dialog and the focus is in the expand/collapt button; (thanks to oort) [Micheus]
- Fixed hard crash caused when a dynamic sub-menu (like Render) doesn't have any item; (thanks to oort) [Micheus]
- Fixed the start value to Edge component. Different of the others it was starting from 1 - now it starts from 0; (suggested by Caverman) [Micheus]
- Fixed the bad display of values for the columns Volume and Area in the Tools->Scene Info. (thanks to ggaliens) [Micheus]
NOTE:
- Fixed crash caused by user hit ENTER in a dialog and the focus is in the expand/collapt button; (thanks to oort) [Micheus]
- Fixed hard crash caused when a dynamic sub-menu (like Render) doesn't have any item; (thanks to oort) [Micheus]
- Fixed the start value to Edge component. Different of the others it was starting from 1 - now it starts from 0; (suggested by Caverman) [Micheus]
- Fixed the bad display of values for the columns Volume and Area in the Tools->Scene Info. (thanks to ggaliens) [Micheus]
fix tests
update README
Datentypen geändert mit Momo
slam 'n toro
Merge branch 'master' of github.com:Mobots/mobots
experimenting with parameters 'n sync
Added default index per type on settings + fixed failing tests after upgrade to 19.*
[updated] Version 0.0.6

Version 0.0.6
[CHANGED] graphics
Updated British English MythFrontend, MythArchive, MythGallery,
MythGame, MythMusic and MythZoneminder translation from Nick Morrott

(The other files contained no new translations.)

Thank you Nick!

Closes #10492
Add compat.h to playbackboxhelper.cpp for MinGW compilation.
Apply fix from 139a98e45d5d5d907390 in correct area.
(cherry picked from commit e47bcd4955118cb7f8ad52e4388d38f395a1d96f)
added example/self-server.js
Sparse tests all passing, will add literal
Update master
Merge pull request #228 from Araxes/patch-25

Tradotto dal Jap.
Rename package summon.ui to summon.misc
DB manager
Placeholder widget
Staling branch widget: no edittext available
Invert menu order
Better toggle for Android 4
Search button launch first item in list
Hide message icon for home numbers
Better UI cleanup

Fix a weird bug when launching an application, changin orientation and getting back to Summon
would keep text filter.
Merge branch 'master' into db
Remove useless attribute on DataHandler
Added Widget Support and Merge remote-tracking branch 'origin/widget' into widget

Conflicts:
	AndroidManifest.xml
Merge branch 'master' of github.com:Neamar/Summon

Conflicts:
	src/fr/neamar/summon/SummonActivity.java
Insert data into SQLite history
New Widget Preview
Retrieve data from SQLite
Retrieve distinct rows
Better predictions

Use previous usages to predict future clicks
Bug fix for newly added/deleted apps
Useless if
Add notification (only at homepage) if username is an email
Commiting minor changes to for equals and compareTo.
Change struct. Add public directory.
Add databasefunctions
readme
Version bump to 0.7.8
updating version
Regenerate gemspec for version 0.7.8
cleanup + google cdn for dojo
Added Credits for the Logo and Favicon made by David Smith
PIMS1672/73 Add requisition item to requisition.
Improved README.
Added --no-option's and made args more config-friendly.
GUV hat der Klee geaendert ;-), und die Invarianten in die Javadoc
geschrieben usw...
Remove Data.Parameter
changed misleading name, written tests and Makefile
Fixed the majority of the pocode examples
Merge branch 'master' of github.com:Potion/pocode
Fixed appointment panel stuff
Merge branch 'master' of https://Kagutsuchi@github.com/Proj11/Proj11.git
.DS_Store removal

God those hidden files are annoying.
Some test classes for using GXT widgets with Vaadin
Ignore local resources
add tim.c/.h
add attachInterrupt.c
fix css~
add some custom stuff - lose NPC
Simplified and prettyfied error handling. Added a test file.
smaler footprint for bool type
add riv/path.vim
valid filelink highlight/ todo helper for local file
fix file pattern and paths
2 bugs fixed: session keeper + deleting only own tickets.
2 bugs fixed: session keeper + deleting only own tickets.
This folder contains requrments related documents
Fix formatting of NEWS web page
Cosmetic changes and added comments
Clarify use of jobcomp plugin in web page
Add some SUG2012 presentations to the web site
Minor bug fixes and documentation updates for reservaions excluding users/accounts
Fix for cleanup so no bad memory gets referenced
BGQ - if a block's cnodes go into error while no job is running this will
catch, and fix, the problem when the next job comes through to use it.
Add task_pre_launch_priv call in task plugin API

This privileged call is executed just after the fork of each
forked task by user root before becoming the user. It enables
the task plugin to perform actions as a privileged user in
every task context.
Use task_pre_launch_priv in task/cgroup common logic

Prepare the use of task_pre_launch_priv to attach tasks to
the various cgroup subsystem in order to no longer have to
add the slurmstepd to the cgroup and let him belong to the
default cg of each subsystem.
Put forked tasks instead of slurmstepd in the step memcg

Now relies on the task_pre_launch_priv to add tasks to the
step memcg and delete it at the end of the step.
slurmstepd no longer has to be added to any memcg for the
logic to work.
xcgroup: add notify_on_release support in xcgroup_t
Task/cgroup memory logic now try to manually remove the cg dirs hierarchy

In order to be more deterministic in the removal of the different layers
of memcg involved when a step is running, do it manually by first acquiring
a lock on the root memcg to protect concurrent creations of step memcg from
invalid intermediate memcg directories in their own hierarchies.
task/cgroup: disable notify_on_release on the slurm root cgroups

In order to avoid the removal/creation of the slurm root cgroups
of the managed subsystems, disable the notify_on_release to prevent
the release agent from removing them automatically.
fixed bad endif for front-end systems
code comment
Fix typo in tooltip for thread tools.
added basic robots.txt

added basic robots.txt for protection of user uploads and searches
[fix] search performance regression introduced in b28e8de71dbd6f8f45909caa374dfa5c7aa74c3e
update jquery from 1.8.0 to 1.8.1
fix li line height in slidebar
fixed regression inline answering

stopgap measure till finally migrating thread_line.class.js
refactored thread toolbox fading to backbone
use faster find method
Don't count bots as guests
removed thread.class.js
set page: to 1 if last visited page was 1
made automatic mark as read more robust
added 'bot' to guest filter
removed thread.class.js include in debug mode
moved auto page reload into js and hotfix for no autoreload when inline answering
recompiled production js
code comment
set title tag in mix view to subject of root posting
fix new entries are marked read on autoreload

The new action entries/noupdate is the sibling to entries/update but
does the opposite. It always prevents the mark as read.
added time to logfile
Function to generate basic test data files

For other language implementations: Bootstrapping round-trip test with
known-valid blobs from the reference implementation.
put process paper instead of proj_calvinball in nav
Add mod_mem_cache to Apache
Frontend: Improve Apache configuration, inspired by octopus conf
BUG: Do not display "false" error message when loading PythonQt module on windows.

* To illustrate the issue, if we consider a python module named FooBar.pyd,
the build directory would also contain a file named "foobar.idb".

Since on windows the python function 'glob.glob. is case insensitive. The
function importQtClassesFromDirectory was reporting an error while
trying to first load the lower case version of the module. Then, the correct
cased module was successfully imported. Reporting an error that
didn't really occurred was confusing the user.

* The solution consisted in matching the filename using the provided
"filematch" expression.


* Note also that the code has been re-factored, the function
"importClassesFromDirectory" has been introduced.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@19695 3bd1e089-480b-0410-8dfb-8563597acbee
Support for | in the command field.

This commit alters the behaviour when reading the configuration file to assume
that the command field is not terminated by a |, but is the remaining contents
of the line.
Add a tool for coallescing stdout.

This is part of a workaround for #001. Commands that produce output early can
be piped through block to coallesce their output so it is available in a single
read (or multiple caller-buffer-sized chunks).
Add some examples to the README.
Getting ready for release
Back to the old way of doing things
Whoops :D
Return to HashMap!
Back to new development.
Made things cleaner
Fixed memory leak in ProfileSaveTask
Added permission node for Iron Grip
Fix Iron Grip calculations using incorrect values.
Fixed admin chat being seen by everyone
Added ability for custom blocks to drop a range of items. MOD BLOCK
FILES WILL NEED TO BE REDONE.
Added Ability API
Cleanup cooldown monitoring a bit.
Add ability to check if any ability is enabled.
Fix add_history and a few peers
Implement set -o = pretty print
Basic Plugin Tutorial provided by Bukkit.
Add ctrp and vim-textobj-user bundle
Suppression du fichier de diff
Merge pull request #593 from nouiz/c_code_cache_version

C code cache version
Activate WASD controls
Changed password encoding to sha512.
Bugfix: login is done with the account, not the display name.
Fix: Don't load opponents in practice/replay mode.
Working on bracket handling in resolve_symbol
Check the Term status and retry failed promotion.
ENG-3206 Handle replica changes during promotion.

Fail promotion and retry; add a testcase for the replica
change handle triggering.
ENG-3206 Initialize the requestId

Initialize the Term requestId and write a testcase showing
stale responses are rejected.
Refactor BabySitter a bit

 * Cleanup some correct(?) but confusing locking.
 * Prefer <T> Callable to member variable + runnable.
 * Change blocking ctor to a factory that returns the
   new babysitter and the initial observed list that
   was seen atomically with the first watch.
Refactor Term for startup.

Use a countdown latch for missing startup sites in place
of the hokey kfactorForStartup flag/mutable constant thing.
More work on failure-during-failure and startup sequencing.
Fix for eng-2997. Use JSON format internally.
Fix test bugs in tests that didn't expect the json format
ENG-3828 improved matcher diagnostic message
Crikes. This was supposed to be part of the previous merge.
ENG-3350: Improvements to determinism checks
Remove checks based on value
Speed up checksums for statements and parameters
Palindrom Check added
GEt right column working
bugfix: mixed up isdone / isundone
converted TreeTable to a jquery-widget
allow admins to remove all flashes
Updating .rvmc file to use ruby 1.9.3.
new (better?) macro system, and also numbers are readed as numbers
Initial commit of the project files.
Updates README.md a little with coding style.
Updated README.md with more information on coding practices.
Added documentation to the CheeeenSec library.
Added profile base.
Added a route from /profile/(:any) to /profile/index/$1 in routes.php.
Fixed footer in login.php and logout.php. Now has the correct filename.
Updated links to home and profile in header.php.
Added a tag styling to the #top_bar.
Added database config file.
Added default config file.
trabajo en bloques
trabajo en bloques
Add Practise folder
Implementadas y comprobadas las comunicaciones en el proyecto
Fixes #18. Adds relevant test case in formats/test/test7.derric.
Merge remote-tracking branch 'upstream/master'
Fixes for loading embedded records.

This fixes the following issues:
- https://github.com/emberjs/data/issues/540
- https://github.com/emberjs/data/pull/523
- https://github.com/emberjs/data/issues/504
- https://github.com/emberjs/data/issues/516

(I realize there's a lot of work going on embedded records on another branch, but this enables us to use the current functionality with the current master..)
RunBlast: outfile is generated and saved to BLAST directory, but SoftwareAssembler can't find it --checks for a None.csv file. (Why?)
Remove bin from redis_failover goof
Merge branch 'Reduceless-experimental' into ReducelessMigration-experimental
Fix calculation of value column
Change accumulate method to store IntervalSum

IntervalSum was unused for the accumulate reduction type.  Changing this
so that the IntervalSum is used; this will be the same as the Value
field.
Merge branch 'Reduceless-experimental' into ReducelessMigration-experimental

Conflicts:
	source/ZocMonLib/Framework/StorageCommandsReducelessSqlServer.cs
Change migration script to copy accumulate's value column to interval sum
Get records to update on flush
Fixing bug with updating values on flush

Existing logic seems to assume that database records are always dense.
If that isn't the case, in-process records can be combined with
nonmatching database ones.
Merge branch 'develop' into DynamicTables-experimental

Conflicts:
	source/ZocMonLib/Framework/RecordFlushUpdate.cs
Merge branch 'DynamicTables-experimental' into Reduceless-experimental
Merge branch 'Reduceless-experimental' into ReducelessMigration-experimental
Merge branch 'ReducelessMigration-experimental' into zdprod
don't need old tests anymore
jsdoc fix at version api function
Merge branch 'master' into openstack-os-build
Add updated submodule references for master
Merge branch 'master' into openstack-os-build
Merge branch 'master' into openstack-os-build
Add updated submodule references for openstack-os-build
Add updated submodule references for master
Merge branch 'master' into openstack-os-build
Allow the dashboard to create/edit users
Merge pull request #860 from cloudedge/pull-req-master-9c6bb88a8b

Update network-nodes view to use correct conduit and interface info [2/5]
Merge pull request #862 from cloudedge/pull-req-openstack-os-build-71d8f5f3ae

Update network-nodes view to use correct conduit and interface info [4/5]
Merge pull request #864 from galthaus/pull-req-openstack-os-build-9b7a8a8c89

Allow dashboard to create users [3/4]
Merge branch 'master' into openstack-os-build
Merge pull request #867 from galthaus/pull-req-openstack-os-build-c7cf1b6667

Fix refs again [2/3]
Merge remote-tracking branch 'origin/openstack-os-build' into openstack-os-build
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into openstack-os-build
Merge pull request #869 from cloudedge/pull-req-master-fe72cb025b

./dev pull-requests-gen --branches master cloudera-os-build openstack-os-build hadoop-os-build --barclamps nova/master [2/5]
Merge pull request #871 from cloudedge/pull-req-openstack-os-build-b8f200da98

./dev pull-requests-gen --branches master cloudera-os-build openstack-os-build hadoop-os-build --barclamps nova/master [4/5]
Merge branch 'master' into openstack-os-build
Merge remote-tracking branch 'origin/openstack-os-build' into openstack-os-build
Increase slightly light sensor interval
Make sure we send the right referrer for forms too.
Added display logged user name
begin rewrite is invoked with r b rather than r s
add requirements file
add docstrings and update documentation. also added TODOs
fixed conflicts
Added the screenshots to README.rst
Added project folder for OOAD
changed the query to AND from OR
Merge branch 'master' of https://github.com/ageesh/yiiapp.git
finished search across the site
Created the controller and also done with shortlist profile rendering
Add part 3 cover
Add download slide
Add task slide
HostFiles: filenames encoding translation implemented
errors fixed in HostFiles
tm: set window name
Set guru-mode off.
Fix to indentation error
First attempt at issue #101

Not entirely expecting this to work, but will give it a go and try
something else if not working.
Replaced south delete_column migrations with rename_column to preserve data.
On donation page made funding partner section more apparent

To make sure organisations don't follow the donation flow
that is aimed at individuals we make the link to future funding
partners more apparent.

Fix #98
Merge branch 'feature/donation_page_98' into develop
Fixed missing link on funding project page

. #87
Actualizando parser de declaraciones en base a la actualización en le parser de pruebas de equ.
Releasing 0.8.4
Mt. 13.23
Mt13.23
Матфей 13.23
Update mainimage_fadeout/index.html
First big upload
Hotfix decoding and decompression data from puppet plugin
Merge pull request #243 from quamilek/dev

Hotfix decoding and decompression data from puppet plugin
Correzione issue #10 e #11
added nonfancy terminal output option as requested in issue #9
added short explanation of how to use database references
fixed validations for non-string values
view is not allowing to access model data, we must prepare it in controller or before views, awesome
Merge pull request #5695 from lest/patch-1

add type option to atom feed entry builder
notice warnings supressed on  variables
models
model
models
models
improve README style
Bug 54259 - Introduce a CSS or jquery-like based Extractor
FIX EOL
Bugzilla Id: 54259

git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1422649 13f79535-47bb-0310-9956-ffa450edef68
Periodic bodies reuse their non-periodic implementations.
delay 可为负数，从而实现tooltip的效果
Add 'user-select' mixin
Bump to version 0.0.6.
В случае, если редактор не выбран - берется первый попавшийся
Попробовал форматирование через netbeans + добавил недостающие assets для виджетов редакторов
Пробую phpstorm =)
=)
мердж........
=(
=(
Установлен редактор поумолчанию для всех модулей (Имперави Редактор)
На странице настроек модуля в панели управления теперь выводятся ошибки настроек этго модуля
Добавлен новый дамп closed #122
исправления ошибок в модуле feedback
Исправление ошибок в модуле feedback + closed #64
merge
Moving CSS to a new file to reuse 'cancel button' on inputs
Adding new library to add cancel buttons on the inputs
Using new cancel button library for search instead manually
Fixing style
Using a dataset instead take all inputs
Merge pull request #2796 from albertopq/contacts-bugfixing

[Contacts] Adding 'cancel text' button on every input
Merge remote-tracking branch 'upstream/master' into contacts
Making add 1 field work
rf; song vk share
Mailinglist tweaks; growl fix
Halfway through the mailinglsit
Cleanups and softer dependecies

* YAJL -> MultiJson
* Gemfile -> waffle.gemspec
Merge pull request #1 from arr-ee/brush-up

Cleanups and softer dependecies
Updated readme to reflect changes from #1
print statement -> print function #113
implement HtmlColumnTable.
let odict update() from other odicts as well.
add the ability to add class attributes to tr th and td tags in the HtmlTable protocol.
add an experimental lxml-based templating engine(!!)
preserve order where possible when generating flat_type_info and simple_type_info
ignore
update .gitignore to ignore *.bak files, an artifact of 2to3
remove senseless assert from Integer.to_string
add sample usage for _HtmlPage
add support for locales in parts of html generation
add ImageUri primitive and have it supported by HtmlRowTable.
changelog update
Merge pull request #139 from plq/master

html updates
Miscellaneous fixes to get ready for production
bin: --validate
Changed the config.assets.manifest to nil in the comments in the production config template.
Merge pull request #5623 from Houdini/master

Remove redundant variable from core_ext/hash/deep_dup.rb
Merge pull request #2528 from cesario/fix_2507

Rails.initialized? can be called at any time without raising an exception [Closes #2507]
Add test for default_url_options[:port]
Merge pull request #5630 from andhapp/fix-config-asset-manifest

Changed the config.assets.manifest to nil
much code can be deleted thanks to @tenderlove's refactoring
Added config.action_view.embed_authenticity_token_in_remote_forms

There is a regression introduced in 16ee611fa, which breaks
remote forms that should also work without javascript. This commit
introduces config option that allows to configure this behavior
defaulting to the old behavior (ie. include authenticity token
in remote forms by default)

Conflicts:

	actionpack/CHANGELOG.md
config.action_view.embed_authenticity_token_in_remote_forms is true by default

Changed default value for `config.action_view.embed_authenticity_token_in_remote_forms`
to `false`. This change breaks remote forms that need to work also without javascript,
so if you need such behavior, you can either set it to `true` or explicitly pass
`:authenticity_token => true` in form options
Cover one more case in auth_token and remote forms

If embedding auth_token in remote forms is off and we
pass a value for auth_token it should respect it.
Allow ActiveModel::Name to duck type
Add a test case for layout nil.
datetime_select should work with -/+ infinity dates
clarification to prevent confusing newbies; Passenger/Unicorn are app servers, Apache/Nginx are the web servers along with thin a la Heroku etc.
Set proper rendered_format when doing render :inline

Closes #5632
Remove code duplication in InclusionValidator and ExclusionValidator.

Orginal code by @jamescook

Closes #1352

[Rafael Mendonça França + James Cook]
Merge pull request #5643 from rafaelfranca/remove-duplication

Remove code duplication in InclusionValidator and ExclusionValidator.
Merge pull request #4843 from seamusabshere/patch-1

Possibly clearer way of getting rid of ` and "
Merge pull request #5359 from avakhov/missed-commits-from-3-2-stable

Missed commits from 3-2-stable
Fixed bug in Quoting that caused classes to be quoted incorrectly
Remove unused parameter in ::instantiate_fixtures

Second parameter of Fixtures::instantiate_fixtures was not used, so i removed it.
Remove unused private method in fixtures.rb

Remove the unused private method ActiveRecord::Fixtures#yaml_fixtures_key(path).
Fix bug when url_for changes controller.
Refactor Generator class to not rely on in-place editing the controller
Fix transaction state not changing when after record gets commited
Add CHANGELOG section for unreleased Rails 3.2.4; document addition of #beginning_of_hour and #end_of_hour to Time and DateTime core extensions.
Consistent CHANGELOG entry indentation.
after_commit :on => :update should be called when save is

called from after_commit callback
make both cached and record_updated accessors in one line
Merge pull request #6227 from mjtko/changelog-fixes

Updated activesupport CHANGELOG
Rename some variables

Rename some parameters and instance and local variables, mostly in fixtures.rb.  Also remove an unused assignment to an instance variable.

There are minor code changes.
Merge pull request #6226 from gnufied/master

Update tranasaction state when record gets commited 
Merge pull request #5362 from zenprogrammer/quoting_bug

Fixed bug in ActiveRecord that caused classes to be quoted incorrectly
Allow to run `connection_adapters/quoting_test.rb` independently
Merge pull request #4254 from alexeymuranov/my-nicify-fixtures-rb

Rename variables and remove unused code in fixtures.rb
property subtypes and some modifications on admin panel
update bundle pg
more css
Merge pull request #184 from bdupree/master

More css style
more css≈
Merge pull request #185 from bdupree/master

more css
- Added scrollbars to textfields2.
локализация
катлог
Adding Bootstrap CSS to unit tests.
Update libmowgli-2 snapshot for the 545783278278th time.
minor fixups for gem installation
Fixed deviceenumerator.h to work in non-c++11 mode.
changed git update policy
added scour
Added normal rendering
add collapse docs
Merge branch 'master' of github.com:baixing/Puerh
Docas.io synced with 13f7bb1
Added the unified flags mod and removed the carts mod
Removed hard-coded menus.
Hack to allow private files to work with image styles.
Start drafting up new tests.
Error -> TweepyError
Basic JSON parsing working.
Remove dead code.
Removing cache. This may or may not resurface in 2.x.
Implement more API endpoints and fixes for auth.
Refactor authentication for changes in Requests.
Make supported formats for parsers a bit cleaner.
More methods!
Implement more API methods.
Last of the friendship methods implemented.
Implemnt user endpoint methods.
Implemented favorite methods.
Refactor parser API to allow for raw responses.
Implemented list methods.
Implemented some of the accounts methods.
Implemented saved search methods.
Remove discontinued code.
Remove duplicate code from BundleNode
fixed a caching speed issue by only selecting certain fields from DataSourceDownloads. Will fix further
Pass options to saving events, new per-entity saving events. Fixes #141
Make DOM parsing service configurable, fixes #116
more styling and js functions
Updated translations from pootle server
Merge branch 'master' of https://github.com/LibreCAD/LibreCAD
Updated translations after lupdate
Updated translations from pootle server
Updated translations after lupdate
Polyline segment, do not add a zero lenght in closed pol
polyline equidist correct bulges, and more
Merge pull request #313 from Rallaz/master

more polyline equidistance work
toolbar select: fixed select single slot, bug#3503760
language selection: fixed duplicated items, bug#3503780
Language selection: file cleanup
ellipse: moved elliptic integral to rs_math class
Patch #3491896 Updating pline Data tanks to Rocks
fixed unique_ptr comparison
End fix bug #3488284 not correct equidistant pline with arc
moved simultaneous quadratic equation solver to rs_math
Merge branch 'master' of github.com:LibreCAD/LibreCAD

Conflicts:
	librecad/src/lib/math/rs_math.cpp
	librecad/src/lib/math/rs_math.h
fparser: fixed type mismatch
Merge pull request #314 from Rallaz/master

Fix bug #3488284 Cannot create correct equidistant polyline containing arc
fileio: more fix for unique_ptr
BF consolidating metrics templates in each metric's directory
Added a Triangle class cluster
Found a better way of handling factory subclass construction

http://blog.sidu.in/2007/12/rubys-new-as-factory.html
Modularized the cluster factory ::new swizzling
Added ThreePointArc
Fileman_Files - BugFix при абсорбиране на файл
docoffice_Pdf - bugFix
fileman_Info - Константите се задават в setup класа. При определяне на
баркод се гледа дали има генериран JPG или не.
Convert to JavaScript.

Initial pass starting with the generated CoffeeScript. Dedented the
source code so that future cleanup will not create messy diffs. Copied
over comments from CoffeeScript source. Deleted CoffeeScript source.

Leaving the tests as CoffeeScript and Streamlined CoffeeScript for now.
It still makes sense to demonstrate that Proof works with CoffeeScript
and Streamline.js. Going forward, I'll organize the tests by language.

Not all of the tests will translate to Node.js test. Cleanup is
particularly dependent on Streamline.js to perform cleanup
asynchronously.

Removed CoffeeScript compilation from `Makefile`. The `Makefile` remains
to create the `proof-getopt` program from the Bash `getopt`
implementation we've included as a `git` submodule.
Merge branch `javascript` into `master`.
adding basics of migrations and order by
Remove .DS_Store
Remove debugger
Add devise-i18n gem
added virtual ui elements
build: check all scripts before building tarball
kalua: scheduler: removed unused call
kalua: system: ram_free() summarize MemFree + Buffers + Cached - same in debugger/cron.minutely
kalua: cgi-bin-404.sh: another disturbing client/HTTP_USER_AGENT blacklisted
kalua: webcam: dont build vars twice
build: set_build: write symbol, also when its not there till now
kalua: S69: changed a log message
updated tree structure for widget
updated mockups based on code review feedback
Don't use nyan cat reporter
Make npm test call mocha command
Added a short article introducing ROCJS to NetKernel developers.
Applied Roman Cheplyaka's patch to make ministg compile with GHC 7.4.x
Port of DelaunayTriangulation:

 * add tolerance to IncrementalDelaunayTriangulatorTest
Added a semi colon.
Add a new project named cstoa to the repo
undo spurious dependencies

git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.00@12430 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Attempt to fix #5805 (not tested).

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13065 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
#5805: Changes file.

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13066 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
#5812: compile read_cmt.opt (about 10x faster than read_cmt to generate .annot files).

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13067 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Backtrack wrong commit on boot/ocamlc.

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13068 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
PR#5762: Add primitives for fast access to bigarray dimensions

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13069 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
added: show a gtk dialog with the error when zeroconf is not supported as well as print the error to stdout
Some cache work
Real Time Maze Version 1.1 minor bug fixes

Fixed Random glitch which made program less random
Fixed menu editor
correction bug form + Jquery sur noseboxes
Lots of style changes to the workboard and workflow.  Added some tooltips and some minor fixes
workable visualization.
Lots of site updates for demo
initial space for results page, some commented-out api bits
Modified Hierarchical Cluster: added JSONString representation
Merge branch 'master' of github.com:broctany/weka
Final tidy up (remove commented code, relocate UI template file)
Update lib/UIKit/TUIView.m

Fixed line indentation
Updating plugins
Converting submodule paths to git repo urls
Merge branch 'master' of github.com:bsimpson/.vim
Leaving note on ViM plugins
Merge branch 'master' of github.com:bsimpson/.vim
Added new plugins
Added a custom attribute for the shared type resolver, to avoid having to use typeof each time it is used
making phdthesis contain draft watermark
Merge pull request #44 from bvferguson/master

Images are soooo DONE!
Changed constructor of Event class for easier use of dates.
Merge pull request #45 from yonata09/master

Updated Event class construct
started to implement edit events. trying to implement local databases helper
forgot to add manifest file to commit
Merge remote-tracking branch 'upstream/Master'
made, but not completed, edit events. Made my saved events...need to implement a check if there are any saved events
Preserve registers during garbage collection.
Added check for in-use cells in free list.
git ignore test output

test-output had been inadvertently added

git ignoe test-output
add 1st pass maven maker build for comapitive purposes and as a target for approximately what maker sould be able to auto-generate
Let's take a default config from the user's home directory if nothing is given
Work in progress for the correct handling of complex tunnels
A little refactor: merge the callback and the application
From Connector::Callback class to module
Migrate all interactive shell stuff to clir
Add a way to see the running threads
Bug fix (connector.rb) and output cleanup
Fix output of forwarded port in some cases
Update some packages
Add a command to have version information
Migrate to clir 0.0.3, adding the concept of subcommands
Adding a sqlite queue to node - allows plugin results to queue for sending later if the server dies - creates a problem of thundering herds when the winch server is restored
Added stub for Sass section
add charts dir
...
Added 'Support' static page
Add text.
Merge branch 'readme'
random regeneration
Added MX backslash node, #167
Bug 805984 - [Dialer] Remove useless locale strings r=vingtetun
Merge pull request #6511 from ochameau/useless-strings

Bug 805984 - [Dialer] Remove useless locale strings
Bug 811684 - [BB][Contacts] Apply Building blocks [lists]
Merge pull request #6424 from basiclines/contacts-apply-building_blocks

Bug 811684 - [BB][Contacts] Apply Building blocks [lists]
Merge pull request #6465 from leibovic/crash-info

[Bug 801938] Crash reports information page for "What's in a crash report?" and "Learn More" links. r=kaze
Bug 812973 - Remove async getFile call before launching activity
Merge pull request #6507 from daleharvey/812973-activity-security

Bug 812973 - Remove async getFile call before launching activity
Bug 813294 - Backout setting mozAudioChannelType until it works
Merge pull request #6513 from daleharvey/813294

Bug 813294 - Backout setting mozAudioChannelType until it works
Bug 810031 - [email] Remove workaround for Gmail-over-ActiveSync embedded images; r=asuth, a=blocking-basecamp
Merge pull request #6514 from mozsquib/email-no-munge

Bug 810031 - [email] Remove workaround for Gmail-over-ActiveSync embedded images
Tutorial added
Merge pull request #6508 from lodr/fix-open-data-usage-tab-from-widget

Bug 810919 - Added new web activities to open Cost Control application in different views
Merged because r+ and blocking-basecamp+
Merge pull request #6510 from lodr/fix-cost-control-lazy-load

Bug 813243 - Lazy load of Cost Control widget
Because r+ and approval‑gaia‑master+
Bug 804977 - [email] Inbox box is wrong when it contains accent like in french 'Boîte de réception' and can't check mails. r=squib, a=blocking-basecamp

Land changes from https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/80
Merge pull request #6515 from asutherland/mutf7-folder-names

Bug 804977 - [email] Inbox box is wrong when it contains accent like in french 'Boîte de réception' and can't check mails. r=squib, a=blocking-basecamp
Merge pull request #6483 from jaoo/804960

Bug 804960 - B2G SMS: Management of Special ASCII characters in SMS, r=kaze
Merge pull request #6431 from crdlc/some-literals-fb

Bug 812184 - [Contacts] Facebook - Some changes in literals requested by...
Merge pull request #6456 from crdlc/new-design-import-curtain

Bug 812465 - [Contacts] Facebook - New design for import curtain [r=jmca...
Bug 812975 - fix share activity
moving scripts to bottom
removing jquery ui css
fixing indentation, removing commented html
removing superfluous meta tags
lowercase doctype