labofsahil/github-event-dataset-2012 huggingface dataset:
LIB: Fix a segfault and add an error message on boost string tokenizing
LIB: Don't auto generate nodes from profiles with no ethernet vendors
LIB: Replace a few more special characters in the generated template names
LIB: Add a TODO for ticket #323
LIB: Continued work on HoneydConfiguration tests

Reworked Adding node functionality to test for more
error conditions as well as separated some of the
auto configuration workflow to be less error prone to
code modifications.
LIB: Honeyd Config - Fix merge conflicts
Merge branch 'integration' into HoneydHostConfigUnitTests

Conflicts:
	NovaLibrary/src/HoneydConfiguration/HoneydConfiguration.cpp
	NovaLibrary/src/HoneydConfiguration/HoneydConfiguration.h
LIB: HDConfig - fix mergeconflict
HHCONFIG: Attempt at fix for port generation

Fixed a few mistakes in the creation of ports in the case
that we don't match a behavior or script.
Merge branch 'integration' into AsyncHostConfig
LIB: Fix AddNewNode bug caused by checking iface string before initialized
LIB: Remove a debug cout
Merge branch 'AsyncHostConfig' into integration
Merge branch 'integration' of ssh://helios/home/git/repositories/Nova into integration
UI_WEB: Make setting up the Logging Preferences string user-friendly

Has labels that tell you what's up and drop downs for the values to 
construct the string; also allows you to see the preference string as it 
changes. Saves correctly.

Issue: #312
BUILD: Make sure all the mkdir calls are done before installation starts
UI_WEB: Move SaveAll call in profile editing to after when the profile saved
UI_WEB: Make setting up the Logging Preferences string user-friendly

Has labels that tell you what's up and drop downs for the values to 
construct the string; also allows you to see the preference string as it 
changes. Saves correctly.

Issue: #312
Merge branch 'integration' of ssh://helios/home/git/repositories/Nova into integration
Merge branch 'integration' into AsyncHostConfig

Conflicts:
	NovaWeb/views/includes/advancedConfigForm.jade
UI_WEB: Fix newlines, indents, and misc whitespace issues in main.js
Created TVScreen class, which does an ok job of tvifying images
Snout is working now
Fixes
Starting chat app
removed newProject.zip
resolved issue #13, stripped field names from data string if value is null
corrected type checking for null
Merge pull request #14 from JoshBones/master

Josh has already put in an issue noting that we will not be able to set NULL values in the database once this change is applied
resolved issue #13
[enh] keep total to opencorp
[mod] removed cruft
The best file README
Cleaned up formatting
Cleaned up formatting
Added 'return_none' option to create for cases where there is no body returned by the API.
Changed the 'is_loaded'/'set_loaded' methods to a property 'loaded'. Added a 'reload()' method to refresh the instance with the current version on the server.
Implemented the cloud database bindings.
Fixed the unit tests to work with recent changes.
Vaadin 6.8
renaming should be done now. i hope. maybe.
Includes RubyGems for ruby 1.8
Animate fixed

flyjs.Dom.Fx.animate fixed.
Added record state
OFC-659 BP form: Trees (4) If there are many trees in the plot, the
Scoll down and Up dissapear (disabled) 
Changed project version
OFC-660 Support nested multiple entities with "form" layout
Change artifact version
OFC-660 Support nested multiple entities with "form" layout
OFC-626 Import XML functionality
Code clean
OFC-626 Import XML functionality
Merge with branch alpha2sp2
OFC-423 UI to select ZIP with XML files to import and resolve conflicts
(record-level)
OFC-626 Import XML functionality
Merge branch 'alpha3' of https://github.com/openforis/collect into id3sp1
missing file from commit

Signed-off-by: Eko Suprapto Wibowo <swdev.bali@gmail.com>
not using ofc_schema_definition ids any more

Signed-off-by: Eko Suprapto Wibowo <swdev.bali@gmail.com>
lavfi/showwaves: simplify check in filter_samples()

Also fix Coverity issue CID 733743: Dereference after null check
lavfi/showwaves: return error in case of allocation failure in filter_samples()
ffprobe: fix potential NULL pointer dereference

Found by Coverity, should fix CID 733741.
lavfi/movie: return proper error code in case of av_get_token() allocation failure

Also slightly clarify logic, and should fix coverity issue CID 717771.
kgv1dec: fix end condition

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
vf_boxblur: cosmetics to reduce diff to qatar

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/fifo: fix indent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
vf_fieldorder: switch to filter_frame, this filter did not support real slices

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
vf_fps: switch to filter_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
lavc/libschroedinger: add missing failure checks in ff_create_schro_frame()
lavc/qtrlenc: return proper error codes from qtrle_encode_init()
lavfi/avcodec: copy pos field from AVFilterBuffer to AVFrame pkt_pos
lavfi/avcodec: always use av_frame* accessors in avfilter_copy_buf_props()

Use av_frame_* accessors for the newly added fields in AVFrame (for which
we are supposed to use such accessors), and group the istructions
accordingly.
lavfi/avcodec: make avfilter_fill_frame_from*() functions use avfilter_copy_buf_props()

The code in avfilter_copy_buf_props() is more generic, allow code
factorization.
rv40dsp: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
lavfi/avfilter: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
log: swap colors for muxer and codec layer

This way the filters which are semantically closer to the codec layer
have a (subjectively to me) more similar color.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avutil: add get_category() for the case where one AVClass can have more than 1 category

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
lavc: seperate encoder/decoder class category

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
lavf: separate muxer/demuxer class category

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
MDL-30888 Accessibility: small calendars summary does not display 'Data table'
Second attempt to commit list.js change to fix stripe() issue on AJAX
update.
timing logs bug solved
update frisbee, static module
petri net api 4.02
Remove trailing newline/null in domainname (was cutting a char to
much).
fixing title name for docs
Worked on StatsTabs
Mejoras 12/09/2012
Mejoras 13/09/2012
Mejoras 13/09/2012
Mejoras 13/09/2012
Merge branch 'master' of https://github.com/GILBERTH12/Estados.git
Mejoras 13/09/2012
Mejoras 13/09/2012
Mejoras 14/09/2012
Mejoras 18/09/2012
18/09/2012
18/09/2012
Mejoras 18/09/2012
Mejoras 18/09/2012
Mejoras 23/11/2012
18/09/2012
18/09/2012
Mejoras 30/11/2012
Mejoras 30/11/2012
attempt to fix resend
Feature: Add Integration tests and a full run of Githug

All of the levels are now tested via the Githug CLI except:
 * Any level requiring user input (interactive rebase, merge conflicts)
 * The final contribute level

The tests can be run with rake as normal
Skip config level for Travis
Merge pull request #89 from Gazler/runner

Feature: Add Integration tests and a full run of Githug
added lights, new vehicle, delta-time
changed to delta-time
Implement requirements analyzer.
Implement locator for external dependencies and add test + fixtures.
Removed Log
Made a package for IO
Restyle chat config frame.
Restyle criteria alert, tweak other alerts.
Yet more fixes...
rm init.el~
Andoid might work corectly
start abstraction of the AGG lib
remove now useless var
Improved error handling for chdir calls
Fixed some minor formatting issues in 'old_basic_structures' and 'operations_on_arrays'.
fix for 2504: WITH_CUDA disabled with OSX in 2.4.3.
Merge pull request #178 from cuda-geek:fix-2504
Png from 9.10.2012
Modified log prunning
compressed lscache, redid constants, added treedownloader
passes all commonJS tests
AMD and CJS compliance using link.js library
Performed datebase migration from sqlite to pg
Generated scaffold for film
The pageId in formated applicant data should belong to the page and not the application page.
Fix the difference in case
update big package name
Debug console output of loaded packages
reorganise projects scripts
Added font size change cmd
added HEART_TOOL_BUILD to tool version of dll
added proxy switch to PlayTV and WeebTV
Basic infrastructure for a KJob tracker plug-in.
Initialize the model early enough to capture all jobs.
Track KJob status and info/error messages.
Fix tracking of very short-lived jobs.

If finished() is emitted while we wait for objectAdded(), e.g. within a
single-shot timer, we only see the deferred delete, which made these jobs
look like they were stuck and/or leaked.
Don't attempt to build KDE4 code when using Qt5.
Make the webinspector plugin build with Qt5.
Actually look for the optional Qt5 modules as well.
V_01_02

Update README.txt
Updating a whole bunch of mods
Ninja: fix Linux build
Merge topic 'ninja-cldeps' into next

1d55ea5 Ninja: fix Linux build
CMake Nightly Date Stamp
CMake Nightly Date Stamp
Fix reporting about not-found include directories and libraries.

This fixes a regression introduced in 290e92ada86c5b74669be48ee901494ae8e48ee3
which loops over cmGeneratorTargets before they get created, so the container
is empty.
Merge topic 'fix-NOTFOUND-processing' into next

47edd55 Fix reporting about not-found include directories and libraries.
Fix configuration-specific include directories in multi-config.

Commit 08cb4fa4c0378468fc2757666701617f6fe8270e contained an incorrect
assumption that CMAKE_BUILD_TYPE was set on the makefile for each
generated configuration in multi-config generators. Fix that by
making the GetIncludeDirectories API depend on the config.
Merge topic 'fix-INCLUDE_DIRECTORIES-multiconfig' into next

fd35b53 Fix configuration-specific include directories in multi-config.
Add tests for EXCLUDE_FROM_DEFAULT_BUILD

Add tests for EXCLUDE_FROM_DEFAULT_BUILD and its per-configuration
variants.
Add property EXCLUDE_FROM_DEFAULT_BUILD_<CONFIG>

Allow EXCLUDE_FROM_DEFAULT_BUILD to be specified per configuration.
Define property EXCLUDE_FROM_DEFAULT_BUILD

Add definition and documentation of properties EXLCUDE_FROM_DEFAULT_BUILD
and EXCLUDE_FROM_DEFAULT_BUILD_<CONFIG>.
Merge topic 'vs-exclude-per-config' into next

cb13d34 Define property EXCLUDE_FROM_DEFAULT_BUILD
9d94586 Add property EXCLUDE_FROM_DEFAULT_BUILD_<CONFIG>
05630f5 Add tests for EXCLUDE_FROM_DEFAULT_BUILD
Break if there are no more commas in the container

This was causing an assert on Windows which has safety features for
iterating past the end of the container.
Add some more asserts to verify code-sanity.
Merge topic 'generator-expression-bug-fixes' into next

0c1379b Add some more asserts to verify code-sanity.
929956f Break if there are no more commas in the container
Find PostgreSQL headers on Debian

Fixes Debian bug 665721 (http://bugs.debian.org/665721)
Merge topic 'fix-postgres-debian' into next

4cbc1e5 Find PostgreSQL headers on Debian
0e90394 CMake Nightly Date Stamp
e0e190c CMake Nightly Date Stamp
Add pika as pystil dep
tryStartGame()
lite andringar i main
Adding more mobile styles
Глобальные переменные для MySQL
Merge pull request #6 from electronrussia/master

Глобальные переменные для MySQL
Adjust timings on flarm declaration, still work in progress
Update changes
require 3 points for calibration, instead of just 2
fixes bug in parse2ltl where propositions with 'do' in the name were being mangled
bring mopsy up to date again
fixes bug where speceditor would ask to save even upon opening a fresh document
speceditor will now ignore missing region files instead of crashingn
rename iros10 example to firefighting and update
#7 Joomla admins and event organisers can access the event edit view.
New columns added in the role table to facilitate this.
Update Laxy/PanelDB.cs
Fix default hello message
Added colors, cleaned up code
refacter: SendSMS
refacter SendSMS: inContacts -> getNameByNumber
Merge pull request #46 from tikiet/br-1.0

Br 1.0
Must have a value to clean.
Improve stability of HostConnectionPool
implementados metodos de group
Merged 3940d63
Merge pull request #8 from LordRNA/master

Organizando un poco el manejo de comandos
Agregado el comando Snooze
Agregado el comando Snooze
updating to version 0.1
MGR adjust RedBean own property (activite & famille)
Fixed null pointer for WorldGuard.IsInRegion
LOTS of changes. Finished ShieldRegion object and adapted all protect classes and API
Trying again
Removing autocomplete limits.
edit from ipad seems to work!
Revert "lol"

This reverts commit 7f6f0e181e6855c9707eb66f103ec8f135a094ef.
Revert "Revert "Revert "Revert " cx""""

This reverts commit a74b0d0e1e16d62c1544cf414eb600a324ffdaa5.
Revert "Revert "Revert " cx"""

This reverts commit 60c283fa81021f1d49beee244b9d2e76c3ef8032.
Revert "Revert " cx""

This reverts commit dc87e1503ee96efc42fc6c26421a0c33a10d9c62.
Revert " cx"

This reverts commit 9bfc22018610b250bbbb82a4b743a1dc7142c48c.
Revert "test"

This reverts commit 71c20486085e82b42ecaa4adb05754cb4c23168a.
Revert "Removed all the cats"

This reverts commit edcdd2af5ec9bc46da70e3608f839afd46dbe2c5.
Revert "Add all the octocat txt files"

This reverts commit 68b4073711df6263d3e4606fab93199ff1393209.
Revert "Revert "Add all the octocat txt files""

This reverts commit 7c690d81910473c47f884123d2b6f7d6a1f79e07.
Revert "Revert "Revert "Add all the octocat txt files"""

This reverts commit fe32ca8dff5d6f94b39d99c607d17f5c065dca3c.
Revert "Revert "Revert "Revert "Add all the octocat txt files""""

This reverts commit bcdcd80aac9fed09e3b0ce4c5bfcc49bd0f68a58.
Revert "Revert "Revert "Revert "Revert "Add all the octocat txt files"""""

This reverts commit 88833ddd38eff4d081f414526907bcf186d48315.
Revert "Revert "Revert "Revert "Revert "Revert "Add all the octocat txt files""""""

This reverts commit 1428df6a842d9000a04e7ed697d864b50d6f21b3.
Revert "Revert "Revert "Revert "Revert "Revert "Revert "Add all the octocat txt files"""""""

This reverts commit 8df79c7df83455734dca825bf455ab69110c41b3.
Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Add all the octocat txt files""""""""

This reverts commit 7ab2fda8e9afe5f7c0cd982ece94445f39245ffb.
Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Add all the octocat txt files"""""""""

This reverts commit 79312b018e5a4b63840c08f9ae3f632058b2bd46.
Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Add all the octocat txt files""""""""""

This reverts commit ce368482f0b8b991f58348ce91ded5e63b8576f6.
Added automatic travis badge to documentup [ci skip]
fix return type of relative size
add special cases in sub2ind for 0D
add missing includes
add variant of make_position that takes alignment directly
add sub2ind 0D tests
use nD typedefs in subscript test
use sub2sub in function
only set -Wno-delete-non-virtual-dtor for C++
remove braces in sse2 maximum
moving around common.hpp includes so as to avoid circular include problems
Revert "Moreinclude and circular dependencies fix in boost.simd"

This reverts commit 9687363d0c79d31093a5cbf913c26b96a394ee22.
Now with frames (not activated by default)
Add "--no-stylesheet" support (something I should have done when I implemented that option)
[MOSYNC-2164] Android: Fixed a problem causing native method table to be incompletely read, and also placed wait in maWait in a loop to handle spurious wakeups.
Merge pull request #149 from divineprog/ThreeZeroTwo

[MOSYNC-2164] Android: Fixed a problem causing native method table to be...
Added the windows advertising libraries locally and as references inside the mosyncRuntime csproj
Merge pull request #86 from spiridon-alexandru/master

Added the Microsoft advertising libraries locally and as references inside the mosyncRuntime proj
Fix a clang-related compile issue

Fixes #10473.

Port the mplayer yadif filter fix (revision 32437) to mythtv port to allow compile with clang

mplayer log: yadif: Explicit wordlength for compare. Fixes compile with clang.

mplayer cvslog reference:
http://lists.mplayerhq.hu/pipermail/mplayer-cvslog/2010-October/040647.html

Signed-off-by: Gavin Hurlbut <ghurlbut@mythtv.org>
MythUIText: Add attributes to <scroll>, allowing the themer to control the
rate (pixels/second) and delay (in seconds).
Fix typo in deadlocked log message.
Update master
Merge pull request #712 from turex/patch-50

Tradotto
Update master
Merge pull request #232 from Araxes/patch-27

Tradotto dal Jap.
Gradle Release Plugin - new version commit:  'priam-root-1.1.14-SNAPSHOT'.
Adding linux iw.
Обраотка нажатия клавиш в qml (неаккуратно с focus)

По хорошему нужно бы использовать FocusScope, но я не разобрался,
а с ходу не заработало.
fix temporary directory creation in opam switch
Merge pull request #17 from avsm/master

working opam switch
send origin.id and requestedBy.id in form to simply saving requisition binding
following used variables so PiEdits show only used vars
PiEdit has parens around colons
added ready, Memcheck-clean, documented lab_05
Laget toXML og from XML i employees
Added hyperalignment measure for searchlight

Added ismooth as measure for smoothing

Added RSMMeasure for RSA
Added StaticProjectioMapper to use arbitrary matrix computed elsewhere for transformation
NF: Add scatter_neighborhood()

Neighborhood seeds (or centers) are placed on coordinates drawn from a
provided list so that no seed is part of any other neighborhood. Depending
on the actual shape and size of the neighborhoods, their elements can be
overlapping, only the seeds (or centers) are guaranteed to be
non-overlapping with any other neighborhood. This can be used to perform
sparse sampling of a given space.
Merge remote branch 'mh/master'
BF: Don't rely on OrderedDict in tests (only from Python 2.7 onwards).
Merge remote branch 'mh/master'
modified hyperalignment measure to ignore scaling
data if scale=0.0
Hypearlignment algorithm is changed to use the same reference in the last step
BF: Let scatter_neighborhoods return ALL indices for non-unique coordinates

This makes it more usable for multi-space datasets, where e.g.
neighborhood should be scattered evenly across multiple spaces -- run it
one per space and take the intersection of the index lists.
Added hyperalignment tutorial & data for the turorial with description.
Merge branch 'master' of git://github.com/PyMVPA/PyMVPA
Made dgesvd as the svd implementation to use in ProcrusteanMapper
for hyperalignment
Merge remote-tracking branch 'gh-swaroop/master'

* gh-swaroop/master:
  Added hyperalignment tutorial & data for the turorial with description.
  modified hyperalignment measure to ignore scaling data if scale=0.0 Hypearlignment algorithm is changed to use the same reference in the last step
  Added StaticProjectioMapper to use arbitrary matrix computed elsewhere for transformation
  Added hyperalignment measure for searchlight
Merge branch 'master' of github.com:swaroopgj/PyMVPA
DOC: Restructure hyperalignment example

Needs more text, more polish, and a figure with the preserved similarity
structures.
Merge branch 'master' of git://github.com/hanke/PyMVPA
Added similarity structures to the hyperalignment example.
DOC: Polish, restructure, extend hyperalignment demo.
DOC: Polish, restructure, extend hyperalignment demo.
DOC: Rename and list hyperalignment example on website
ENH: use verbose() instead of plain print while giving output a bit of structure
BF: forgotten import for mvpa2.tests.test_usecases.test_gnbsearchlight_permutations
Player sprites added
Adfd
updated sec-oct 2012
define SPELL_ATTR_EX3_TARGET_ONLY_PLAYER and use it!

Big Thx to Schmoozerd
https://github.com/wow4you/mangos/commit/d679c679f2ee7c1fc4a853ca65c0989985a8b2cc

( Fix a lot of aoe spells with should only hit players, like 63342, 28089)
maybe we should implement addtional code in SpellCastResult Spell::CheckCast(bool strict)
disable custom code for 69298 - Cancel Resistant To Blight (Festergut)
Removed accidentally committed pre-compiled library.
add filter log stuff
Paint only the parts of the display that need painting
fix table / simple table end ptn.
NOT WORKING SOMETHING TO DO WITH J.

TAKE OUT TO WORK PROPERLY
Fixed InactiveLimit math to work correctly
switch/nrt: release resources from failed allocate
Implemented simple weighting, which didn't work too well.
spelling eror science_fiction-trancendence
Update README.md
Merge pull request #1 from kahnjw/master

Initial Merge
Merge pull request #6 from SiegeLord/master

dil: 64 bit compilation fixes.
lexer: removed unnecessary casts.
dil: changed variable types to auto or size_t.
lexer: fix: Identifier* pointers in struct were null.

* Moved allIds() into the generator function.
IdTable: fix: insert Ident.allIds() into static table once.
lexer: work around DMDBUG 7967.

* Appending cstring to char[] from function doesn't work.
  E.g.: result ~= String(p, end);
dil: renamed parameter of expandVariables().
Identifier: changed static opCall()s to constructors.
lexer: made Identifier const by default.

* Identifiers shouldn't really change once they're constructed.
* This change also greatly simplifies the code
  in generateIdentMembers().
  The runtime init function and inner structs
  aren't needed anymore.
Converter: fixed unittest; declare array as static.

* DMD doesn't default initialize struct members,
  if the variable assigned to isn't static.
* Removed unnecessary static opCall().
dil: fixed opEquals() methods of Float and Complex.

* Defined opEquals(Object) methods to handle general cases.
* Added equals alias to provide a shortcut to comparing
  (without going through opEquals(Object).)
* Return bool from opEquals().
util: fixed some function headers.
dil: improved Float unittest.

* Fixed function calls to "mpfr_*".
main: fixed segfault when accessing assoc array.

* DMD segfaults when key type is cstring.
* Print all settings in sorted order.
dil: refer to the project name as "DIL".

* Capitalized all references to DIL.
  Exceptions are: URLs, file and path names.
semantic: changed Module.ID member type to size_t.
ast: implemented unittest for Visitor classes.
dil: improved emitting unittest messages.

* Added class UnittestMsg.
  It simplifies writing messages to the console.
* Fix: don't run DIL when compiling unittests.
build.py: disable inlining by default (DMDBUG #7967).

* Inlining causes too many bugs. Better to disable it by default.
* Compile with option version=D2 by default.
lexer: removed redundant String() function.
Fixes #128

- load and update submodules
- fix clone into ";" directory
only print if has output
remove sites.json
add isResource()
Merge pull request #137 from stanistan/master

\Sky\Api\Resource::isResource($test)
getList now auto generated for models given their aql.
Merge pull request #138 from stanistan/auto-get-list

getList now auto generated for models given their aql statement
docs and usage
ModelArrayObject docs
update
typeo and more comment
Merge pull request #136 from stanistan/submodule

Submodule
Merge pull request #140 from stanistan/auto-get-list

docs and usage
fix double param issue
remove old code
fix action -> method mapping
Merge pull request #141 from will123195/master

fix duplicate param issue
prevent warnings on json_encode, sometimes for recursion
fix typeo
Merge branch 'master' into validate_
Release slapos.cookbook-0.70
Advertise development of new versioon
Use newer slapos.cookbook
explicitly set rpath for zlib otherwise dmtx-utils might be linked to system zlib.
use relative paths in extends of fusionnews
BUG: don't build editor module gui when there is no main window - fix for 1895

git-svn-id: http://svn.slicer.org/Slicer4/trunk@19913 3bd1e089-480b-0410-8dfb-8563597acbee
COMP: Fix unused-but-set-variable warning in vtkImageAccumulateDiscrete

git-svn-id: http://svn.slicer.org/Slicer4/trunk@20680 3bd1e089-480b-0410-8dfb-8563597acbee
[wip] preparatory stuff to get mc running
Merge branch 'master' of github.com:SpuqTeam/spuq

Conflicts:
	src/spuq/application/egsz/adaptive_solver.py
	src/test_zone/egsz/demo_residual_estimator.py
	src/test_zone/egsz/demo_sampling_adaptive_algorithm.py
Added shared folder specific scheduler
minor tweak to field def
New version to get some people out of the blue
Se termina el modulo comenzar de Controlador
Introducimos un toString a la recta, para la salida por la pantalla
[mr1982] fix mapping with DBC structure in mangos core AND ->spellwork<-
[mr1983] some ulduar spell hacks
[mr1984] fix some behaviors in PetAdvancedAI - cast and combat movement. related to #997, #1000
[mr1985] restore possibility usage basepoints from SPELL_EFFECT_NONE efeect types (hack, as i think). close #996
[mr1986] not-in-world unit not may cast. related to #993 (cheating?)
[mr1987] not use ObjectGuid::Null in copying parameters. related to #992
[mr1988] try use transportGuids in object movement updates. testing.
[mr1989] remove default size from ByteBuffer, must true resize autamatically. testing. may cause crushes!
[mr1990] implement PUSH_INHERITED_CENTER push type. related to #933
[mr1991] Fix Talent Rapture only Power Word: Shield returns Mana to Priest
[mr1992] Finish convert code to use HasAttribute()
Merge branch 'master' of git://github.com/mangosR2/mangos
Merge branch 'master' into reload
Ajout d'un fichier de diff.
custom redirect of failed login
:erge branch 'develop' of http://github.com/Th0ar/zjforum into develop
Fix some tests. We where always using the wrong mode.

There is still a problem that make 3 tests fail, but PL will look at it next week.
Merge pull request #901 from nouiz/neib

Fix some tests. We where always using the wrong mode.
tests which explain use of Selection.ANY/ALL on Included and Excluded Category
Mise a jour importante de la fenetre principal
add the ability to join and leave a coalition
add join/leave buttons to coalition page
fix for ARC errors and other warnings
make-bacon.sh now signs the rom
fix type in docstring
Merge pull request #2564 from UtahDave/develop

Spelling fixes. Grammar Fixes. Clarifications
Merge pull request #2561 from giantlock/develop

fix type in docstring
Add note on gzip support

Gzip support added in cp.get_file and cp.get_dir
This is just a test of git commit for the first time. You can ignore the changes here
Revert "This is just a test of git commit for the first time. You can ignore the changes here"

This reverts commit 26c3b76468ed24aeefd3e3b069fe5a43ed078c6f.
Merge remote-tracking branch 'upstream/master'
Add a test file to test the CSVLoder class
Merge remote-tracking branch 'upstream/master' into csv-loader
Add more asserts into the TestCSVLoader file
remove the primary key defined in the BLAH table
Add different data types into the table schema
Merge branch 'csv-loader'

Conflicts:
	tests/frontend/org/voltdb/utils/TestCSVLoader.java
Comment some data types to be checked for later, focus on the six simple types right now
Simply output the wrong line number to the console right now
Add a blank function to check parameters for each line in csv file, this will be filled by zheng
Add TODO task lists for zheng and me;Add a produceInvalidRowFile to record the invalid rows in the csv file, still need to write this function; Add line number infomation into the callback of the insert procedure and a invalid list to record it synchronously
Sort the invalid numbers; Add more fixes to the callback
Able to write the invalid rows to a file
use @adhoc proc to get schema and validate lines in a csv file
Fill out the checkLineFormat function to check the number of parameters
Merge branch 'master', remote-tracking branch 'origin'
Merge branch 'master' into csv
Put the line check related task into the function
ENG-4101 seed random generator from transaction id, instead of unique id
Merge pull request #300 from VoltDB/ENG-4101

ENG-4101 seed random generator from transaction id, instead of unique id
ENG-1413 removed -J- requirement to be consistent with voltdb command line environment specification
For ENG-3861, a few tweaks towards a finished framework
disabled zeromq, as there is currently no version of libzmq.dll for win32 and php5.4
c_facets display
field collection 1.x-dev
removed c_facets dependency
split c_groups into 3 features
final readme fixup
bug now generates 10 qr codes by default
getqr now defaults to the current directory
moved qr labeller's folder to 'label'
QrLabeller now responds to requests for help using -h or --help. It also
takes the image directory as a required argument, exiting if it is not
given.
Basic project structure.

I started differentiating between the com.yannbane.alib package and the
com.yannbane.bann package. All ANN code is now in the bann package,
which exposes the class BrainANN.
Updated to 1.5.2 (see version_history)
Sprite is offset on tiles, made a note of that
Added missing crumbs
Give managers access to the participation report
Fixing .travis.yml I hope
libata: acpi: set can_power_off for both ODD and HD

Hard disk may also be runtime powered off, so set can_power_off flag
for it too if condition satisfies.

Signed-off-by: Aaron Lu <aaron.lu@intel.com>
scsi: pm: add may_power_off flag

Add a new flag may_power_off for scsi device, it gives the user a chance
to control when the device is runtime suspended, can we remove its power
if possible.

I'm planning using this flag for sr and sd.

For sr, if user set 0 to may_power_off, we will disable runtime suspend
for ODD, since runtime suspend for ODD is wholly for zero power ODD, if
we can't power off the ODD, there is no meaning to do runtime PM on it.

For sd, if user set 0 to may_power_off, we will not power off the device
when it is runtime suspended.

Signed-off-by: Aaron Lu <aaron.lu@intel.com>
scsi: sr: use may_power_off to enable/disable ZPODD

In case user's system is broken with ZPODD(either platform or device),
we use this flag to let user disable ZPODD.

A sysfs entry may_power_off is used as the interface to show/store
the scsi device's may_power_off flag.

If 0, we will disable ZPODD; If 1, we will re-enable ZPODD.

The sysfs entry for may_power_off only appears for those ZPODD
capable system(platform + device), and may_power_off implies
can_power_off.

By default, we set may_power_off to 1.

Signed-off-by: Aaron Lu <aaron.lu@intel.com>
scsi: sd: add may_power_off sysfs entry

If the platform is able to power off the scsi device, add a sysfs entry
may_power_off to let user control the may_power_off flag of the device.

This flag will control when the scsi device is runtime suspended, can we
remove power from it(e.g. let it enter D3 cold ACPI device state).

This flag is used in libata-acpi.c to decide which ACPI D-State it will
enter when runtime suspended.

Signed-off-by: Aaron Lu <aaron.lu@intel.com>
Less spam when generating dungeon.
Started working on less code duplication in parsing of the datafiles.
Starting to build a page.
fadeinfo appears instantly
Users view

+ Added Users Controller
+ Added #view et #create view for UsersController
+ Added #view view
+ Fixed missing column in User model
+ Added validations for User model
added hello document
blog:will_paginate close #1
Add check for sw reset
laid out workflow
Patient Chart is now scrollable and items checked in Nurse Intervention will show up in the chart
renamed to use markdown
Add IRC protocol utility functions
Image in Properties
add Color.clone
Update with 2.1.1 release details

Added 2.1.1 Release Notes
Fix partner sites project page, missing partner listing.
Merge branch 'release/2.1.1' into develop
[Fix #48] Translation of sortable project list header labels

Replace the django-sorting "anchor" template tag with the tag
"tranlsate_anchor", adding translation of the label and a third optional
parameter to set sorting direction.
[Fix #92, fix #96] Move IATI ID to project funding page, remove dupes in
project partner list

The IATI activity ID was moved to the project funding page, but it was
forgotten on partner site. Fixed.

The list of partner organisations on the project main page of both RSR
and partner sites shows the same organisation multiple times if it has
multiple partnership roles in the project. This is fixed by using the
Project.partners many-to-many field rather than the
Partnership.partnerships related name.
Fix for Issue #94

This resolves the issue presented that the website field is not indexed
and so cannot be used in the search term. This has been removed so now
it should work - but you can only search on Name and Long_name.
Fix to issue #94 (2)

Extended the search options to project, project updates and project
comments. Need to see whether the indexing is present for all the
fields mentioned in the search - otherwise these will need to be taken
out or the index updated.
[Fix #65, fix #43] Use thumbs in large maps popups. Enable scroll wheel
zoom on large maps.

Add "extra_thumbnails" to Project.current_image and Organisation.logo and
define a "map_tumb" thumbnail to use in the popup windows on the large
maps showing all projects and organisations respectively.

Enable zooming using the mouse scroll wheel on the large maps.
Merge branch 'develop' of github.com:akvo/akvo-rsr into develop
[Fix #99, #48] Add sorting on location in partner sites project list

Also set sorting to "asc" and add translation to the same column on the
RSR project listing page.
Another fix to #94

Removed the unindexed items - I don't think they're necessary right now.

Also added search box to publishing status.
Merge branch 'develop' into feature/dev-env
updates
added
Integrated contexts in bin wgetdb.
Update default vibration limit in README too
Remove warnings caused by output filenames containing % characters
Updated nav for 'contest'
fent el treatment log
Front metatags
Fixed bug when listeners were not called in parallel.
Fixed bug with calling callback several times when some functions were executed in parallel.
Merge github.com:pistolero/async

* github.com:pistolero/async:
  fix browser unit tests by removing some node-specific code
  fix bug in order of queue events and improve tests - thanks Kami
memoize - handle multiple calls before completion
[api test] Added `async.forEachLimit()` and associated tests
[test] Add more tests for edge cases to forEachLimit
fixed waterfall
Fixed a typo in the queue sample
Merge pull request #50 from brunoqc/master

Fixed a type in the queue sample
Merge pull request #39 from indexzero/master

Added `async.forEachLimit()`
bump version
Add unmemoize function
Add unmemoize documentation to README
Unmemoize can be called with a not memoized function, too.
Merge branch 'unmemoize' of https://github.com/balinterdi/async into balinterdi-unmemoize
update minified build
bump version
Merge branch 'master' of https://github.com/braddunbar/async into braddunbar-master
update minified version
bump version
bugfix and new functions.

replace old cordova with 2.1.0 ver.
add video and report and accident function pages.
fix hiddendanger page
fix gas page
Including instructions
Add janus installation option
fixed reference to expando changed to prototype
added screen cast for tdd
working out
[maven-release-plugin] prepare release hw1-amr1-0.0.7
Fix Layer.moveToBottom/moveDown when only one layer is present.

Removes references to undefined objects.
Добавлено кэширование главной страницы и страниц новостей
minor cosmetic changes
more luaT dok
tooltip width, delete all
Fix typo in method's name
My profile Added
mpi and fpi with discretisation artifacts
R file for calling Rcpp function for mpi/fpi su2 chipt
Stashing work on multitasking
Suchbutton modifiziert

Suchbutton angepasst
Use interface

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1424974 13f79535-47bb-0310-9956-ffa450edef68
add spm build in makefile
test travis notification
usage statistics
ver up
html5 fix
saved date recovering fix
rating message pushing; jslint
vk auth fix
rating help message
rating help
complext text
closing message
less flash warnings
master merge
fix error in migration #394
Merge branch 'dev'

Conflicts:
	db/migrate/20120918100141_set_status_for_existing_milestones.rb
Pull most recent commit from the dev branch overriding the patches to master
Add explicit docs about installing Java on FreeBSD and Ubuntu
Release notes update
fix comment from email gray problem
print backtrace for debugging
set status to fail if send email fails
Merge branch 'dev' of https://github.com/liufengyun/jobsworth into dev
finalized aermod plotter tools
metomi/rose#116 Style tidy, nixed rose-task-hook references.
Droits + Includes frmimg en cas d'erreurs
finished network construction
Adding test for humans.txt
maps
LOCATION ACTIVATED! :D
remove unnecessary files
moved maps to a new repo
added selector to ui

want to add a custom tooltip but i need help for that :P
added text
"Created by" section
Merge branch 'master' into gh-pages
add list editing and server announcement
Testing some changes to the reconnection code
Chase sendemail() API changes.
hostserv: stringref clean (ref. #60)
Added ne7.ip.segmentCells3D
[254] LorrisAnalyzer: improvements to ScriptWidget, see inside

* Export AnalyzerDataArea and ScriptWidget's objects into script
* Implement moveWidget function into script
* Implement DataWidget::remove()

This commit makes it possible to code Snake game in ScriptWidget.
Merge branch 'master' of github.com:Tasssadar/Lorris
Added button and edit widgets (usable from script).
[fixup!!!] zfs_inactive: exit z_teardown_inactive_lock in the z_unlinked case
zfs_zget: return a doomed vnode under stricter conditions

and update a comment describing the logic.
nomsayin
corrections to dummy_pcb
Add dispass.el

dispass.el is an emacs wrapper script for dispass, it provides the
ability to recall or create the passwords.
Merge pull request #3 from ryuslash/emacs-wrapper

Add dispass.el
Create the bundle folder.
vim: add puppet.vim
提高代码质量
added encoding to POD
updates to package files and documentation
version fixes
test file updates
don't die when connection/login fails
clean up of blank lines
script fixes
aded debug and history features
updated help messages
improved handling of command history
RT#61433 - always use internal pager
extend time/date formats
minor fixes
revised Net::Twitter version required
revised Net::Twitter API commands
more command failure protection
final prep for release
updated test suite
just use spotlight to find Emacs.app (to be able to pass parameters to Emacs).
Print a pretty date in the tests results list for better context.
Use a more JS style for those view properties.
Merge pull request #24 from basho/sdc-pretty-date

Print a pretty date in the tests results list for better context.
General reorganization and cleanup.
This will live in the basho_bench repo in a hanoidb branch.
Prevent overly aggresive merges and use a specific compression method.
query is an Erlang reserved word.
fix sunday bug in WeekFootprint
improved autocreating Variations on holidays
-- assignment operator (first draft)


git-svn-id: https://root.cern.ch/svn/root/branches/dev/ibucur@46965 27541ba8-7e3a-0410-8455-c3a389f83636
think we're keeping dev local, move development.env to .env locally
- Replace Ajax call with jQuery implementation
Add `.bem` and `node_modules` to `Level.isIgnorablePath()`
Fix jsdoc of `Tech.getPath()` and `Tech.getPaths()` methods: mark `suffix` and `suffixes` arguments as optional
Custom options for bem create commands using API: rethought

Close bem/bem-tools#67
Remove incorrect warning about deps recursion
Refactor LevelNode

- Lazy level object creation
- Use `getItemsByIntrospection()` to collect BEM items to build
- Unify actualization of blocks and elems in `BundleLevelNode`
Merge branch 'master' into refactor-level-build
Add test to build bundle-elements
Correct sorting in LevelNode.scanLevelItems() and BundleLevelNode.scanLevelItems()
Merge branch 'refactor-level-build'
cosmetic fixes. expand item.
swat.
more cosmetic fixes.
characteristics provide their own header.
Hide characteristics if there aren't any set up for the context.
tweak.
Doc updates.
Add support to open links... but only web links. File path links can not be opened from a browser, period.
swat.
Add editing support for url links.
Add validation for links.
Merge pull request #222 from jrogelstad/master

Add support for adding, editing and attaching URL links as documents.
First pass file management.
Add status filter.
Add ability to filter "above" status.
Refine filter behavior.
tired of fighting this. go a simpler way.
Make filter messages meaningful... in a more consistent way.
Improve filter messaging.
Abstract extension capability so it can be implemented in any view. Implement extensions on parameter widget. Add project to Incident list parameter widget using extension.
Fresh Google maps v2 api key
Riorganizzato l'oggetto RCH
converting the html to php and adding header/footer includes.
install includes in proper directory
Modified compile script file for 8 processors
Update to new system for turning mocks on/off (Environment.MockSwitch)
Add SSH forward script
Add paramiko requirement
fir .js file
prettier namevar
emergency roll out
add meej as a user
add tkelter
correct tkelter key type
add mbagley
add nate
use the build-essential group for development of junk
bbs100 source uses autoconf
pull request into our masterless scheme
rework to have all files in the same tree
merge dev into master
kalua: db: report() abort work, if no database entrie found
Remove the old code with fire. Start fresh
Set default rspec options properly
Fix travis config for new branch
Begin CLI spec
Add optparse-subcommand dependency
Fix readme path
Beginning CLI class
more new specs
Add specs for CLI 'add' command
Add pending spec for list subcomannd
Add a pending set of tests for handling default configuration
Add specs and implementation for empty subcommand
Fix broken spec
Add specs and implementation for export subcommand
TODOs
Add some stubs for tests
Begin specs and implentation for import command
Upgrade optparse-subcommand to make parse! method not private
Add minimal Ghost::Host class to get new specs passing after delete and rebase
merge, div refactor, popup, elementselect
bug
Merge branch 'master' of github.com:blahbap/sapup

Conflicts:
	client/js/directives.js
bug
Merge branch 'master' of github.com:blahbap/sapup
buildcalendar refactor
+Changed: Returned join form with Range<U>
Zone reloading updates/fixes

Fixed an issue with initial zone detection.
Added copious log_debug() for the behavior of the rfc1035 reloader.
Added log_info()/log_warn() for actual zlist actions on the runtime
  data structures.
Changed scandir() loop timer to 10s for debugging for now
KSH forcing wasn't working. Unforced orbits do work. Working on a fix. Not done yet. Added functions to convert trajectory KSH states to cartesian states, and write to text file for plotting (e.g. in Gnuplot)
Add binary js files and html for final release
PR#5616: ocamlbuild's manual is now part of the "official" OCaml reference manual, so just remove these files, it's the easier answer to the copyright-minded folks.



git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12479 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Fix for PR#5578 left on trunk but removed from 4.00 because of PR#5578.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12481 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Register button, large and small
Delete
Update ethan-wspace to include "assoc is obsolete" fix.
Clean slate!
Framework and theming.
More work.
++Monokai theme
More work, including JS modes and code style.
Markup and namespacing.
Terminal.
Clojure support with nRepl.
I don't like having to type 'yes' and 'no'
Auto-complete + nREPL source for Clojure buffers.
Set default C mode code style to Java like.
Merge branch 'v2.0' of github.com:bodil/emacs.d into v2.0
Merge branch 'v2.0'

Conflicts:
	.gitmodules
	bodil-c.el
	bodil-js.el
	bodil-misc.el
	site-lisp/cedet
	site-lisp/js2-mode
	snippets/js2-mode/require.yasnippet
	starter-kit-elpa.el
windows build

Requires call to make sure <ql/quantlib.hpp> is included in Cython's
generated .cpp files to make sure all of the MSVC flags are set.

Microsoft Corp owes me for several hours of billable time.
README.md: fix the wiki links
Increase RGB rounding error tolerance. Thanks @KelseyHigham
Merge new tests and fix
Compile fix for OS X.
[Brightbox] Adds way to check auth method

You can access the API with either a account locked API client or
a set of user credentials credentials.

This needs to be available to check so that where API behaviour is
expected to be different we can guard accordingly.
[Brightbox] Adds reset FTP for scoped accounts

This deprecates the old form of #reset_ftp_password_account without an
argument and alows passing of an identifier.
[Brightbox] Fixes Compute#account to pass service

When called out of a collection, the `connection` is passed into new
models. When created themselves models do not have link back to the
service instance (Fog::Compute::Brightbox::Real) causing some actions to
fail.
[Brightbox] Fixes Account#reset_ftp_password

Tests that Account#reset_ftp_password is working (had an issue
previously) and now merges the results in making the password value
available on the model whilst it exists.
Merge pull request #1295 from brightbox/account_updates

[Brightbox] Account updates
Minor cleanup while reading the code
Added some fancy parsing
[Routing] Minor changes
[Routing] Router: Resources are now built just before use.
[Routing] Resources: fixed singularize bug.
[Routing] RouteFilter: updated to use Match.
[Routing] Router: added root, and the ability to control route prefixes and suffixes.
[Routing] RouteMatcher: fixed bug of unset variable.
[Routing] Route: fixed styling.
[Routing] Route: fixed check of built status.
[Routing] RouteGenerator now pulls in required parameters from the defaults if needed.
[Routing] Router: we don't need these getters.
[Routing] Fixes.
general structure
rebuilt gem with bundle gem
Fixed some bugs with descriptions, small tunings to package view, added additional info
papyon: fix _on_chunk_sent and _on_chunk_received in direct file transfer
lintian fixes
better collision repair algorithm
Code cleanup
bugfix thanks to huge test
fix some issues in maker, broken java compile task and some other more minor issues
added HEAD, middleware, requestNamespace, named-routes settability
following mojito code convention
u15 added max server
removing db.php
map~
fix map
last balans
Merge branch 'balans' of https://github.com/carzil/bowman
balans
stringstream::clear() is not enough to reset a stringstream
Closes #556: MXFunction problem with serveral input mappings
Fixed flaw in FXInternal::requestNumSens
delete var_dump in transformToPng
documented e2dScene
Distribution organization guidelines: contributed files in contrib.

--HG--
rename : edit/smith.vim => contrib/edit/smith.vim
Removed license text from examples.
Made some fixes and code tweaks for example scripts.
Updated README. Added some examples and comments.
I've decided that given that time is so critical in games the
current contents of cepl-time really should be a base package that
is :use'd by default.

I have renamed and moved the code and updated the packages and examples to reflect all of this.
And where can you get it authoritatively???
last commit before making changes required for live
prelast commit
Merge branch 'master' of github.com:cdsd/cammouse
Fixes --loader option, and deprecated celery.app.default_loader.  Closes #1066
Tests passing
Fixes problem declaring queues when sending
Now depends on kombu 2.5.3
Now depends on billiard 2.7.3.19 (but always ignore 3.x)
Updates Changelog
[tox] depend on kombu master
Fixes --loader option, and deprecated celery.app.default_loader.  Closes #1066
Add missing CloseDB calls on error paths
Gemspec modification
Refactored commands
Major refactoring of Commands, removed duplicate code, added ability to edit a Category
Refactored error handling and fixed renaming bug
Added the hooks for the help for each command
Finished with the command refactoring and added the extended help for each command
Implement Unicode-safe case-folding for case-insensitive searching

As well as the :fuzzy option for Querying::named, which looks redundant since one is able to search via Regexp.
Turn off this test, as the new and old SROA cause it produce different output.
Left in a note that we need to turn it back on once the SROA fallout is cleared
up.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@164733 91177308-0d34-0410-b5e6-96231b3b80d8
objective-C mrr block. Block variable layout metadata in
mrr mode.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@167331 91177308-0d34-0410-b5e6-96231b3b80d8