labofsahil/github-event-dataset-2012 huggingface dataset:
Merge branch 'ftp_server' of git://github.com/NAR/otp into ftp-server
Merge branch 'ftp_server' of git://github.com/NAR/otp into ftp-server
Merge branch 'ftpsrv' of https://github.com/hosszugabor/otp into ftp-server
Merge branch 'ftp-server'; branch 'ftpsrv' of https://github.com/hosszugabor/otp into ftp-server
Merge branch 'ftp_server' of https://github.com/NAR/otp into ftp-server
Merge branch 'ftp_server' of git://github.com/NAR/otp into ftpsrv
Implement basic message handling
Merge branch 'ftpsrv' of https://github.com/hosszugabor/otp into ftp-server
Document and cleanup message handling
Some modifications
Merge branch 'ftp-server' of https://github.com/hdenes/otp into ftpserver
Correct ftpd supervisor
Skip missing targets.
test commit
laod local.el
add tempbuf
magit added
add dired keybind
cursor move
Fixed pagination bug for features index page
created 'rake rm_feature_key' to removes :tracker_project_id from all features
Hardcode API and Team Tokens

* Add constants for API and team tokens
* Comment out methods that ask for api and team token input
1.0.0 review 2
Feature: change text while it selected (issue #119)
hide footer
Merge branch 'master' of github.com:8manos/dussan
remove unused local variables and a few improvements
Merge pull request #1035 from ceeram/2.3-pmd

remove unused local variables and a few improvements
Added `disabledTag` option.
Closes #3108
Unused import now that we don't need to configure parameters from keywords anymore (superseded by issue #187)
Added reference to options dialog from keyword doc
Added gource script for source visualisation
Merge branch 'master' of github.com:AIFDR/inasafe
Add selectors for curvy corner.
Add curvy corner.
Add curvy corner.
Add curvy corner.
add background and lines
Updated new_message, rollcall and users icons

git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@279 5bc14d19-1e4b-4ba2-aa50-860af135f48c
Updated new_message, rollcall and users icons

git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@280 5bc14d19-1e4b-4ba2-aa50-860af135f48c
Fixed merge conflicts
Fixed merge conflicts
Added module to get directory tree
The adapter to show files does not work
Modified Adapter for files system.Now it is working
Modified module Courses to work with short and full name of courses.
Modified Adapter of file browser to improve the performance
Fixed bugs related to short/full Names of courses
Fixed minor bugs getting right file name 
Added behaviour for navigation buttons(home, parent and refresh)
Merge branch 'develop' of https://hrguez@github.com/Amab/SWADroid.git
into develop

Conflicts:
	SWADroid/gen/es/ugr/swad/swadroid/R.java
Added new field to the Directory Item to identify the file with a
unique code
Added new request for web services Notify Download and management of the
files download
Added Groups to Database
Added correct reaction to back button on messages functionality
Added current course name within all modules 
it is added spinner for group election in download files module. Still
untested
Tested the group spinner and fixed some problems with it and the
obtaining method of groups in database
changed the download of files into an asynchronous task with
notifications on status bar. The notifications should be improve because
they reduce the performance.
Added menu to open or modify files already downloaded
Added initial design for group choice
Added the new menu Enrollment for groups choice
Merge branch 'release/0.9.3' into develop
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	.gitignore
	SWADroid/AndroidManifest.xml
	SWADroid/project.properties
	SWADroid/res/layout/list_items.xml
	SWADroid/res/values-es/strings.xml
	SWADroid/res/values/strings.xml
	SWADroid/res/xml/tables.xml
	SWADroid/src/es/ugr/swad/swadroid/Global.java
	SWADroid/src/es/ugr/swad/swadroid/SWADMain.java
	SWADroid/src/es/ugr/swad/swadroid/model/Course.java
	SWADroid/src/es/ugr/swad/swadroid/model/DataBaseHelper.java
	SWADroid/src/es/ugr/swad/swadroid/model/Group.java
	SWADroid/src/es/ugr/swad/swadroid/modules/Groups.java
	SWADroid/src/es/ugr/swad/swadroid/modules/attendance/Attendance.java
- Fixed wrong id in field reload for shortened case
Merge branch 'master' of github.com:Aquaya/ivrhub
iPhone simulation works now and a method to install the app on real iOS
devices is now present.
Merged Task Interface to AbstractTask class : Only one Task descendant
left
Merge pull request #68 from ChineseDron/dev

[BugFix] dialog renderType
[FIX] XQuery, dividing durations (cbcl-avg-004)
Merge branch 'master' of github.com:BaseXdb/basex

Conflicts:
	src/main/java/org/basex/query/value/item/DTd.java
Ajout des résultats de la compétition + un fichier de participants.csv
Improved arena#show_fight, added comments. todo: abandon a fight
Merge branches 'master' and 'yoones'
Profile page layout works now
Profile page layout works now
[0.5.6.139] Implement Maze Generator.
Include Menu 'Random Map'
Add overloaded Random.Int
Change GridMap.MapBlocks into List<>
[0.5.5.135] Add images for the effects
加入状态栏。

Signed-off-by: CyberZHG <443442708@qq.com>
开始写User表的连接。

Signed-off-by: CyberZHG <443442708@qq.com>
object strings now can take double type values
some tweaks
some tweaks
bullet speed decreased
bullet speed tweak
server now sends HIT msg
Merge remote-tracking branch 'origin/master'
fixe a bug
debug
debug hb
hb
GOM_Ship and GOM_Projectile now handle hitbox strings
hitbox debug
hitbox debug
Merge remote-tracking branch 'origin/master'
Improve WASAPI shared mode logging
Pass new EncodedSampleRate to sink
Fix passthrough in DirectSound, add better logging to DS, cap maximum sample rate to 96khz,
Remove unnecessary locks interfering with playback
Set DirectSound buffer duration to 50msec
Allow AESinkFactory.cpp to enumerate DirectSound devices and WASAPI devices if available and allowed
[DS-1182] Get a fresh Session each time
Merge pull request #83 from mwoodiupui/DS-1182-simple

[DS-1182] Get a fresh Session each time
re-apply changes from modified SVN checkout
take up POM fixes for move to GitHub
Merge branch 'master' of git@github.com:DSpace/DSpace.git into testing-env
Catch up with current stock.
Merge remote branch 'stock/master' into testing-env

Conflicts:
	dspace-api/src/test/resources/dspace-test.cfg
	dspace-api/src/test/resources/dspaceFolder/config/dspace.cfg
	dspace-api/src/test/resources/dspaceFolder/config/input-forms.xml
	dspace-api/src/test/resources/dspaceFolder/config/item-submission.xml
	dspace-api/src/test/resources/dspaceFolder/config/modules/authentication-shibboleth.cfg
	dspace-api/src/test/resources/dspaceFolder/solr/statistics/conf/schema.xml
Use released version of FileWeaver, remove snapshot repo. declaration
Merge pull request #8 from mwoodiupui/testing-env

[DS-859] Packaged testing environment:  begin using the package
working file send
NOVAD: Don't drop out of the Classification loop if reading from PCAP file

Before a single call to ClassificationLop would classify all the suspects, but
now it's possible that they haven't been seen by the ConsumerLoop and 
updated yet.

Ticket #263
NOVAD: Bypass consumer and classification loop if reading from pcap file

Allows us to know when we're done processing the file instead of 
having packets sitting in the Evidence and Classification queues for unknown
amounts of time before the other threads pick them up. Also helps with
performance.
NOVACLI: Add a read/writesetting arg for scripting config file changes
fix bug that prevented titles from using [<>&] characters
rewrote
runtime fixes
Release of com.dexels.navajo.compiler.tsl version 1.0.1
Development stream of com.dexels.navajo.compiler.tsl version 1.0.2
Release of com.dexels.navajo.core version 2.10.25
Development stream of com.dexels.navajo.core version 2.10.26
Release of com.dexels.navajo.tipi.jabber version 1.0.17
Development stream of com.dexels.navajo.tipi.jabber version 1.0.18
Filter bypass bug fixed, filter defaults, WahWah gain bug fixed
Removes async from framework scripts.
corregido la disposición del mapa en el index
init .aide folder
Configurable widget, disk usage widget
added mouse-look class hlview()

tries to create mouselook, but crashes
Functionality to create connectivity matrices.
Some ideas on how the internals of the system should work
fixed: do advanced search, then filter on list and query where statements were not joined with "AND" but "" - causing an SQL error
Missing semicolon on end of line 49, backend form controller.
coursesquare start
adm dos forms faltando a opcao de abrir
improved signalhandling and config-errormessages
Implemented copy instance option.
Removed custom Tuple type, using standard Tuple
Refactored send() methode and added TODO comment
rails_apps_composer: initial commit
rails_apps_composer: Gemfile
rails_apps_composer: initial commit
rails_apps_composer: Gemfile
rails_apps_composer: create database
rails_apps_composer: set email accounts
rails_apps_composer: models
rails_apps_composer: controllers
rails_apps_composer: views
rails_apps_composer: routes
rails_apps_composer: front-end framework
rails_apps_composer: add README files
rails_apps_composer: set up database
rails_apps_composer: extras
new modules
Clarified description for level 16

The instructions said "you don't want to keep the files"  That isn't accurate.  You want to keep the files, not the change.
Merge pull request #80 from petersont/patch-1

Clarified description for level 16
Redirect Voronoi example to bl.ocks.org.
Redirect Choropleth example to bl.ocks.org.
Remove unemployment.json.
Redirect Cartogram example to bl.ocks.org.
Redirect stream & stack example to bl.ocks.org.
Redirect box plots to bl.ocks.org.
Redirect bullet chart example to bl.ocks.org.
Redirect chord diagram example to bl.ocks.org.
Redirect force layout example to bl.ocks.org.
Redirect population pyramid to bl.ocks.org.
Redirect bubble chart to bl.ocks.org.
Redirect calendar view to bl.ocks.org.
Redirect sunburst to bl.ocks.org.
Redirect pack example to bl.ocks.org.
Redirect tree example to bl.ocks.org.
Redirect cluster example to bl.ocks.org.
Redirect treemap example to bl.ocks.org.
Delete more files.
Redirect splom example to bl.ocks.org.
Merge remote-tracking branch 'remotes/mbostock-original/gh-pages' into gh-pages
user password needs to be a bit longer than before, thanks to devise security defaults
no jquery
add_view and app/add_todo fixed
using join in models/model_lost, no need for model_priority anymore
Tetris Version 1.0 in swing
Polish characters
Merge branch 'master' of github.com:Invertika/art
FaceRecognizer supports updating a model now. Documentation has been updated to reflect latest changes.
facerec_demo.py: Updated contact mail address.
minor update (pictures resize removed, emulator screen-shot downscaled)
made opencv headers windows.h-less (Bug #2122)
fixed several warnings from VS2010
added test for png encoding bug #2352
.
Merge branch 'master' of https://github.com/IvaDobreva/TP
Switched to expecter for assertion handling.
Drop cloud_sptheme support.

The docs are now hosted on rtfd, and the theme wasn't used there anyway.
Switched to nose2 for test runner.
Use nose2's outcomes to handle skipped tests.
Use nose2 params plugin to remove duplication.
Simplify disabling of unusable tests under travis.
Default to term-missing in nose2-cov output.
Specify serialisation format for ISODateTimeField.

This makes playing around in the repl nicer.
Added test for get_template().
Added test for jinja filter decorator.
Limit coverage reports to hubugs package.
Merge branch 'feat/nose2'

* feat/nose2:
  Limit coverage reports to hubugs package.
  Added test for jinja filter decorator.
  Added test for get_template().
  Default to term-missing in nose2-cov output.
  Simplify disabling of unusable tests under travis.
  Use nose2 params plugin to remove duplication.
  Use nose2's outcomes to handle skipped tests.
  Switched to nose2 for test runner.
  Switched to expecter for assertion handling.
Initstones haben sich nach dem ersten zug nochmal bewegt, jetzt nicht mehr
Updated variables and object and added boolean function
Added the #ifndef jazz
Added an element class
Added Kent Moe to Authors.
Added Kent Moe properly, and added an AUTHORS FILE.
MPS-17224 Accept yours in merge dialog works incorrectly
fix MPS-16452
correcting tests
correcting tests
fixing tests
Can't chmod when called by www-data
Set title in build rather than init to avoid overwriting on read
GCC 4.8 adds caret diagnostic messages similar to clang. I am using GCC, not clang and therefore hate these messages, so add some code to disable this horribly verbose output.
despues de compilar
Updated the list of packages that must be installed for mp.
Spell wakness/charge(first try)
[Chat] Local timeStamp. When you have more than one page open you will received on every page the new messages.
[Chat] A little bug on local TimeStamp. The server was waiting for a message then started the connection. And you could not receive the offline messages..
[Archive] Create an archive description.
[chat] Put url_base on js files.
[chat] Put url_base where I have forgot. Remove the print line and replace some variable to make ok for the python coding style.
[chat] Change keepAlive time after one minute of inactivity.
[chat] tests.py after time_stamp modification
[chat] sessionStorage.keepAlive, when you are switching pages and you are still inactive
[chat] Solve a bug. When you are ban from chat page.
[chat] change camel case from models.
[Chat] Local timeStamp. When you have more than one page open you will received on every page the new messages.
[Chat] A little bug on local TimeStamp. The server was waiting for a message then started the connection. And you could not receive the offline messages..
[Archive] Create an archive description.
[chat] Put url_base on js files.
[chat] Put url_base where I have forgot. Remove the print line and replace some variable to make ok for the python coding style.
[chat] Change keepAlive time after one minute of inactivity.
[chat] tests.py after time_stamp modification
[chat] sessionStorage.keepAlive, when you are switching pages and you are still inactive
[chat] Solve a bug. When you are ban from chat page.
KWSys Nightly Date Stamp
KWSys Nightly Date Stamp
Merge topic 'minor-release-script-tweak' into next

3f29f75 KWSys Nightly Date Stamp
d19008c KWSys Nightly Date Stamp
CPackNSIS: Rewrite variable documentation to make it more readable.

And avoid parsing problems at the first "."
Merge topic 'CPackNSIS-smallDocTypoFix' into next

fcf265f CPackNSIS: Rewrite variable documentation to make it more readable.
CMake Nightly Date Stamp
Print the output of the try_compile if it fails, for debugging.
Merge topic 'position-independent-targets' into next

84d29a5 Print the output of the try_compile if it fails, for debugging.
CPackRPM: avoid leakage of RPM directive from one component to another.

Fixes #0013248
Inspired-By: Sergei Golubchik
Merge topic 'CPackRPM-emptyPerComponentREQUIRES' into next

7321c94 CPackRPM: avoid leakage of RPM directive from one component to another.
55cadb6 CMake Nightly Date Stamp
Don't run the PositionIndependentCode test on WIN32.

Windows has no fPIC equivalent, and this avoids having to create exports
to properly create dlls.
Merge topic 'position-independent-targets' into next

e8b958b Don't run the PositionIndependentCode test on WIN32.
Revert "Don't run the PositionIndependentCode test on WIN32."

This reverts commit e8b958b7cc9f2533ad0c577db23c39c0de400cad.
Export symbols from shared libraries.

Part of what this branch adds is flags for shared libraries, so that
needs to be tested.
Merge topic 'position-independent-targets' into next

6f0e3f8 Export symbols from shared libraries.
9005e6a Revert "Don't run the PositionIndependentCode test on WIN32."
Only run the PositionIndependentCode test on APPLE if it has fPIE.

An old APPLE platform on the dashboard fails otherwise.
Merge topic 'position-independent-targets' into next

5c79fa5 Only run the PositionIndependentCode test on APPLE if it has fPIE.
Add missing include for check_compiles macro.
Merge topic 'position-independent-targets' into next

eb1b755 Add missing include for check_compiles macro.
Don't set the PIE compile option variable on old GCC.

According to

http://www.linuxfromscratch.org/~manuel/hlfs-book/
glibc-2.4/chapter02/pie.html

it has been available since version 3.4.
Merge topic 'position-independent-targets' into next

ce35b57 Don't set the PIE compile option variable on old GCC.
FindPythonLibs: honor EXACT version specification (#13216)
Merge topic 'FindPythonLibs-13216' into next

034a4d2 FindPythonLibs: honor EXACT version specification (#13216)
Merge topic 'Qt4Macros-generated-resources'

9ce67d3 Qt4Macros: Added support for generated resource files
Merge topic 'qt4-phonon-backend'

ad7c80c Added conditional for the phonon backend plugin.
EventHandler implementeras nu i RemoteGameController för client och onEvent är implementerad
pillat med kontrollern
Fix compiler warnings, not all of them.. some are still there in RenderAirspace, since it is a work in progress up there.
Tweaking spread example.
"Dual" of tempered transitions example.
Activate/deactivate fwd prob calc
(for easily expressing undirected models)
Fix interp range "Bad argument : *.x" error
More printing options for LARJ/MCMC runs.
Shift proposal for structural integers.
Even more stack
Simple examples comparing LA-Church and Church-MH.
Add different version of jsutil
Explicit pseudocode, to be filled out after more research
adding the ex3.rb file
't Begint ergens op te trekken
Vizinhanca M7 do modelo funcionando
temp
Merge pull request #9 from tikiet/master

..
Pass const string& to convert_idrefs for better compatibility with standard C++.
调用init_init_exprs函数在含有&optional参数的函数及其参数初始值列表之间建立映射
对lt_find_symbol使用在函数体之外计算&optional参数的默认值的尝试
定义用于填充&optional参数默认值的fill_frame函数，及其辅助函数fn_init_exprs。并在invoke_function中加入对fill_frame的调用。
增加init_init_exprs函数，用于统一建立函数各种C原语函数与它们&optional参数默认值列表之间的关系。
增加init_init_exprs的声明
backup
just commit
Make web UI reflect the deletion of the DomainGroupVersion abstraction
submodules for network stacks
Adding some comments, escaping layer.id to fix a bug that crops up on some species in the getLayer method, and removing initial map location to eliminate jerky on-load behavior.
Removing initial map location to prevent jerky on-load behavior.
Adding map setCenter call to splash module for blank or invalid querystring requests.
Merge pull request #120 from MapofLife/feature/auto-zoom-to-layers

Feature/auto zoom to layers
IDA* poprawiona, dziala chyba ok

zazwyczaj jest wynik od razu, ale czasami bardzo dlugo szuka i nie wiem
czy to tak ma byc
Changed to default udp with option, added error checking, updated readme
updated default namespaces and assembly names
to match the folder structure in Solution Explorer.  Changes to Roomie.Web.Website will be a separate commit.
Added link to dependencies of boost.SIMD
moar subscriber
Clarify models and naming standard
Remove Session Storage Options that are not really options
No more static Model access
Parser Controller static access
Remove configuration from MolajoController into MolajoConfigurationHelper
Got rid of MolajoController::getXML, switched to simplexml
Remove site and application configuration from MolajoController as each is in own class controller
New MolajoResponderController class
Move set/get body and header methods from Application into Response
Error Page handling is now a normal View/Model, remove all method
Metadata, Head, and Responder
Page View media
Move all core code into application, extension layer only contains extensions
Base class folder in applications
MVC Registry object
Application Language set and get into common method
Error with language object
Application Layer: Base, Services, Helpers
Database Service Class can handle multiple connections
Initiate Services in Application Class
Added adding shared task to shared task support
Sorts now have a plain string overload.
Updated Norwegian Bokmal MythFrontend, MythArchive, MythBrowser,
MythGallery, MythGame, MythMusic, MythNetvision and MythZoneminder
translation from Rune Evjen.

Thank you Rune!

Closes #10494
Remove the use of abs(long long) as it freaks out ARM compilers

Rather than using qAbs or llabs, it's simple enough in the specific situations
to just avoid using abs() altogether.

Fixes #10915
Silence warning about possible null pointer dereference in TVRec::TuningRestartRecorder(). Coverity700407
Silence warning about possible null pointer dereferences in TVRec::CreateLiveTVRingBuffer() and TVRec::SwitchLiveTVRingBuffer(). Coverity 700405
Direct users to FAQ on wiki.
(cherry picked from commit ddcc2bced14811d6e5ce1631a8a829ced80d9d1f)
integrate LConfSlaveExportRules.pl into Makefile/upstream dirs
Update master
Merge pull request #23 from acquetto/patch-1

Update master acquetto
smion ricontrollare ... tradotte delle parole
Update master
Merge pull request #252 from LuCa1111/patch-16

traduzione non completa
Agg.trad.ing e ita

fatto 
Merge pull request #837 from XxBestOnXx/patch-38

Agg.trad.ing e ita
tradotto fino a 111
Merge pull request #63 from marchetto96/patch-13

tradotto fino a 111
Update 3/0000/0138.txt
Merge pull request #845 from Simixp/patch-45

Tradotto completamente tranne le ultime 3 -4 righe che mi sembrano versi di Pokémon
add install packages
dpkg: Fix caching of architecture name

Our deb-closure script would causes zillions of invocations of "dpkg
--print-architecture", which is rather slow.
Get deb-closure.pl to work with the latest dpkg
Update Debian Squeeze to 6.0.6
Add Ubuntu 12.10
Merge branch 'master' of github.com:NixOS/nixpkgs
2nd approach at getting a check for /niximpure in stdenv-updates
Fixing problems in the previous commit. It didn't work.
Merge pull request #229 from viric/niximpure2-stdenv-updates

Allow /niximpure/impure.sh impurity, only for users wanting it
Made in on the githubs
Added YAPOG_LIB macro in some files where it was missing.
use link markdown
Fix `UInt`.
Merge master.
adjusted scale to work better with more objects
Added memory measurement for adding and removing intervals benchmark test cases.
Memory measurement update to use megabytes.
Memory measurement megabyte format fixed.
Updated test for EndPoint<> when one endpoint value is always large than other.
Merge remote-tracking branch 'sidlovskyy/TestsExtend'
final commit everything done
improving for js dev
Stats Djson generation done
PIMS-1543 Externalize properties for Google / Amazon API calls
PIMS-1689 While looking for uses of product from ShipmentItem, I stubled across a bunch of dead controller methods in JsonController...  and then followed those into a lot of commented gsp code.  Removed the commented code, also removed dead methods from JsonController.  Also, fixed the hasCode method signature on some domain objects.  DialogForm is no longer used
Umbesserungen, damit das Eclipse was macht
add bootstrap and basic interface for interacting with data.
конвертнул эти скрипты в UTF-8
Add profile_Typed outputs to .gitignore
Revert "Temporary hack: Disable scope types so that parameters are always accessible"

This reverts commit 20330b2a69beaf50e02f66299a476a5fb03afa42.
Revert "HoleEdit: Gets inferred types of hole"

This reverts commit 346f3f78d222b195266c8241964dfc4bd4b622ea.
HoleEdit gets inferred type via Sugar.Hole
UnionFind can resume
StoredDefinition to TypedStoredDefinition
Sugar: Rename Expression to ExpressionBody
Sugar.ExpressionRef -> Sugar.Expression
fix for cursor in polymorphic funcs with multiple args
Default to not showing types makes demo story more interesting perhaps
Implemented notification on avatar
Implemented notification on avatar
Добавил простой и унылый Makefile
Исправление опечаток
Merge pull request #50 from Pinkbyte/makefile

Добавляется makefile by Pinkbyte
Merge pull request #51 from Pinkbyte/fix_typos

Исправление опечаток. Grammar nazi в лице Pinkbyte.
Save last shader
[224] Added back some missing .htaccess files and edited the installer to properly reflect the new directory structure.
Cleaning up crap that was integrated into poThreadCenter
Added poThreadCenter to poImage and found major circular dependency issue with poDictionary including poImage and poFont for no reason, so cleaned up and added correct references
ADDED : Initial Commit pour l'article sur HTML5 Offline
ADDED : .htaccess pour la déclaration du fichier MANIFEST
IMPROVED : Gestion du cache
IMPROVED : Gestion de l'AJAX dans la gestion des tâches
IMPROVED : Support du mode offline en JavaScript
Tutorials: added @Override annotations
Tutorials: minor changes in two and ten minutes

Emphasis of member instances in the text.
Splitted/merged paragraphs for better clarity.
commit

validate professional and recruiter unique registry 2012-07-20
events modification

events modification
removed public.html from git
litle changes of new user form
[12017] Add support for getRace() of creatures. Thanks to vladimir for input
[12018] Implement spell 51519
[12019] Various changes

* Add some const correctness
* Remove unused Unit::isHover() function
* Help compiler optimize code from last commit (thx to vladimir)
[12020] Implement targeting for spell 30843

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[12021] Fix some warnings

Thx to stfx for porting

Signed-off-by: stfx <stfx@hotmail.de>
Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[12022] Some more warning fixes
[12023] Enable SQL-Storage to work with entries of value zero
Merge branch 'master' of https://github.com/mangos/mangos

Conflicts:
	src/game/AuctionHouseHandler.cpp
	src/game/BattleGroundHandler.cpp
	src/game/CreatureEventAIMgr.cpp
	src/game/HostileRefManager.cpp
	src/game/Level2.cpp
	src/game/Level3.cpp
	src/game/MoveMap.cpp
	src/game/Object.cpp
	src/game/Player.cpp
	src/game/PoolManager.cpp
	src/game/Spell.cpp
	src/game/SpellAuras.cpp
	src/game/SpellEffects.cpp
	src/game/SpellMgr.cpp
	src/game/Unit.h
	src/game/World.cpp
	src/game/World.h
	src/shared/Database/SQLStorage.h
[mr2039] Conditions System: Added condition NOT
[mr2040] forget AURA_296 definition
[mr2041] Fixed Swarming Shadows (Queen Lana'thel) summoning.
[mr2042] Fixes for Queen Lana'thel spells: Twilight Bloodbolt and Splash, Blood Mirror, Pact of the Darkfallen (still needs fix on random canceling of the link), Frenzied Regeneration and tempfix for mind control - at least prevents dealing dmg to boss or healing mates.
[mr2043] Forgot one more ID in last commit.
[mr2044] add new switch in Spell::EffectScriptEffect with identifier m_spellInfo->SpellDifficultyId
- first entry in this switch-construct: Spell Script Effect for Powering Up (Twin Val'kyrs)

@developer:
Please write the spellid's into comment for a full-text search
[mr2045] make code smaller with use of the new switch (m_spellInfo->SpellDifficultyId)
- spell correctness not reviewed, only ported to new switch system
[mr2046] Fixed Pact of the Darkfallen targeting.
[mr2047] Cleanup in FillCustomTargetMap.
Use unMaxTargets variable like in SetTargetMap function.
[mr2048] revert wrong part of 12022 (cause crushes)
[mr2049] some safety in Unit::ClearInCombat
[mr2050] fix broken EffectTriggerMissile targeting. also some extension in SpellCastTarget structure and debug logging. close #1052
fix sched/wiki2 (Moab) to support "#" in job record information

Fix sched/wiki2 to support job account name, gres, partition name, wckey,
or working directory that contains "#" (a job record separator). Without
this patch, the parsing will probably stop once reaching the "#".
Merge branch 'slurm-2.3'
Added check for preeption mode before changing time limit to 1 if flag no reserve is enabled, as this can cause a problem with jobs starting on nodes with future reservations.
Merge pull request #32 from cfenoy/master

Problems with jobs starting on reserved nodes
CRAY - update to work with ALPS 5.1
BGQ - Handle issue of speed and mutexes when polling instead of using the
realtime server.
Merge remote-tracking branch 'origin/slurm-2.4'
switch/nrt: add debugging information to web page
switch/nrt: avoid logging uninitialized variables
include file from last checkin
backport cray 2.5 docs to 2.4
remove licenses subsection
Add basic game simulation and loop
Add node splitting
Add LICENSE
Update README
Add normalization of speed/angle over time
Add time-based strength for splits
Add obstacles, collisions and basic game mechanics
Add node trails
Avoid nodes flying off the bottom of the screen
"Pretty" page
Add basic game over realization
Fix bug where nodes can go through blocks on the edges
Code cleanups
Add energy bar and tweak game difficulty a  bit
Add score and a start/restart game link
Store highscores
Allow starting with SPACE and add basic instructions
Tweak difficulty
Tweak messages
Refactor styles out, add iphone/mobile support
added Beautiful Soup module to the distrib
trying to compile to .exe...
fixed a few things
添加svn使用指南以及sae注册等
Fixes, added lang() function and readme.txt file
Dialog Exseption
Atnaujinu išorinės analizės įeigą
Išorinės analizės lentelė
ADD aa.txt
Document existing but undocumented option.
Add promise to LAMP Apache
BUG 2725. Fixed setting transform node reference. Added test Testing/vtkMRMLTransformableNodeReferenceSaveImportTest.cxx


git-svn-id: http://svn.slicer.org/Slicer4/trunk@21332 3bd1e089-480b-0410-8dfb-8563597acbee
Making the UI nicer. Loading audio files works.
Remove auto-creation of config.rb, use custom build
Merge branch 'master' into fix-config-issue
Change the config.rb to actually use configured variables
Merge pull request #5 from ChinggizKhan/fix-config-issue

Remove auto-creation of config.rb, use custom build
A new route to match optional subdomains.

For example, route :subdomain.zend.com would match both framework.zend.com and www.zend.com. 

Another important feature is URL assembly for various environments. We configure the route to be :env.www.zend.com. In our code, we assemble the URL for www.zend.com. But through local configuration, we could set an environment variable. Depending on the environment variable, the assembled URL would be dev.www.zend.com, stg.www.zend.com, or simply www.zend.com for production.
Done with the ddemo app!
Ya funciona la lectura de ficheros
Cambio absurdo
get-start
..
Nouvelle fenêtre "À propos" -> plus jolie :P !
increment version for npm
doc string typo fix - nos != node
Merge branch 'develop' of https://github.com/saltstack/salt into develop
fix typo in states/file.py
Seeing if we can get pkgng to work with salt
Catching exceptions from M2Crypto.RSA.
Otherwise queue workers can die mysterious deaths when rogue bits float
around.
Merge pull request #1265 from UtahDave/develop

Fixes for bugs causing minion to crash on Windows.
Link to the `Open Comparison Contributing Docs`

The `Open Comparison Contributing Docs` has some good suggestions
and tips for contributors:
http://opencomparison.readthedocs.org/en/latest/contributing.html
Merge remote-tracking branch 'main/develop' into comparison_contributing_docs
Merge pull request #1267 from baijum/comparison_contributing_docs

Link to the `Open Comparison Contributing Docs`
Fix error in top file verification

It looks like the top file verification test that was added had been
tested only on a minion that was running on the same host as the master
Add checks to mode validation, Fix #1155
repair directory mode checks
We don't have the file from the master when it is not a template

Because the minion only downloads the file to eval if it is a template
we can't eveluate the diff. We need to add some more to this but for now
it will fix #1156
Throw  multiple state dec error, fix #1207

when a single id contains multiple state decs it will error out since
the highstate structure does not support this formatting
Adding some default outputters for the test module
Create directories from makedirs=True with the right ownership

Fixes #1264
Comment code for not supporting multiple decs in one state
Add another community state tree to the docs

Thanks @kevindroid!
Fix #1224
Fix bad function call in salt-key env_verify
install devise remove
For ENG-2417, add logging of multipartion transaction first fragment.
ENG-4043 user may now add her jars in lib/extension
ENG-4043 Addressed Steve C code review comment
Merge pull request #289 from VoltDB/ENG-4043

ENG-4043 user may now add her jars in lib/extension
Patched sqlcoverage to avoid an intermittent HSQL failure.
Merge branch 'master' into ENG-3009
Eliminate no-op ORDER BY nodes from single-row plans
ENG-3335 catch a simple missed case of deterministic ordering
fix #1
and other fixes
fix tests
remove garbage
Merge pull request #1 from Arpaso/fix_tests

Fix tests
add log for person
Merge branch 'master' into fix_tests
remove prints
fix changes in template
remove prints
remove user from CompasLog
add single page for waybill history
remove garbage
add waybill_history template
remove log from change_view
fix LoadingDetail matching query
remove permissions from waybill
add rewrite file storage
add command for export waybills
fix tests for export
path to link on export_waybills
Merge pull request #2 from Arpaso/fix_tests

log for person in admin
first import
Merge branch 'master' of github.com:Watcom/vimcfg
Little update with start of IS
modified TYPE=MYISAM -> ENGINE=MYISAM
I'm just trying to pull
Merge branch 'master' of https://github.com/YaleSTC/doris
added role and some stuff
run_BLAST: finished code to update GOterm matrix
test_run_BLAST: finished test code.
test_connect is now the noob_client
Delete useless defs in glpi/defs
Add exception EmptyPage in config_index.py
Create Host.current_status()
Add Service.current_status()
[Internal] Changed to Apache 2.0 to make it GSoc-compliant .. at least I hope that everything's going on correctly ;) - If not, ok :D
want to pull
Merge branch 'master' of https://github.com/aberke/ip_tcp
converging
changed stuff blah
removed CHANGELOG.orig
correct callback name
Added logic to determine disk offering with requested size for create_disk method
added automated build, versioning
Create interface for CalDAV client
Use new client specification
Fix public URL generation
Remove some rgba stuff
Do not use caldavoperations inside caldav2json
Use new client inside Event controller
Use client directly inside Preferences controller
Use client directly inside dialog generator
Remove caldavoperations library
Implement Calendar Finders

Sample calendar finders:

* Calendars found on calendar-home-set of current user
* Shared calendars
Remove unused class
Use CalendarFinder to fetch the calendar list
Correct channels prototype
Add dust.js core from linkedin fork
Load dust.js
Load templates
Add template generation
Fix template compilation
Load templates.js
Remove not needed compiled templates
Add calendar dialog mock-up
Rethink form_* templates
Use default calendar colour
Fix login page JS error
Fix some typos
Add jquery.cookie.js
Read CSRF cookie before creating a calendar
Rename some elements towards consistent naming
Remove unused file
Fix dust.js i18n, allow parameters
Do not exit on compile errors
Fix i18n params
Use dust template for event details
fixed security issue for non-aos users
Added files necessary for import - now with Githubby goodness.
added debug toolbar extension - set config.DEBUG = True to enable
Replaced \t characters with 4 spaces to make CSS formatting consistent.
Merge pull request #71 from timrchavez/master

Normalize spacing in CSS files
Added unfiled ciss files and added t01 to ciss362
@afein ping
@mastergreg added sauce + an abstract of what we talked about
Server and UI are now fully JsonP capable. Added Resume Simulation feature. Fixed Edit Sim Settings issue
Merge branch 'trunk' of gitorious.orinet.nce.amadeus.net:airinv/airinv into trunk
[Dev] Improved the file samples for demo and the json display.
Merge branch 'trunk' into releases
[DEV] Added a const to define the number of seconds in one hour
Merge branch 'trunk' of gitorious.orinet.nce.amadeus.net:stdair/stdair into trunk
Merge branch 'trunk' into releases
[Dev] Finalised the demo sample files.
Merge branch 'trunk' into releases
[Dev] Added the export of bid price vector in json format.
Merge branch 'trunk' into releases
_NSIG may be depend of SIG* const
Vermin on the Mount
Fix `network` and `HTTP` dependencies

This fixes build on Windows. `network` 2.3 unwilling build under 
windows.
Enhancements to build job diagnostics
Explicit use lightweight wrapper around newtonsoft deserialisation for
rest responses. The default deserialiser used by restsharp is weird...
Fixed paging for commit calls. In API v3 the next page of commits are
loaded by proving the last_sha from the previous page.
1872
Added fork notes back in

Signed-off-by: Aaron Vanderzwan <akv292@gmail.com>
Initial datafields changes
Minor html markup changes
Merge branch 'develop' into feature/datafields
[#27008303] Rearranged project details on the project main page
[#27008303] Changed order of and added a tab on the project main page. Added a fold to the project main page.
[fixes #27008303] On project main benchmarks now fold when there is many.
[#27251477]  Enforce maximum length on a number of Project text fields

Add LimitedTextField, a subclass of models.TextField that honours the
max_length attribute. Add ProjectLimitedTextField, a subclass of
LimitedTextField, that removes the MaxLengthValidator for 'old'
projects. Use ProjectLimitedTextField for a number of Project fields.
[#27011303] Renamed Current status detail and Project plan detail fields.
[#27251477] Fix calculation error for when OLD_PROJECT_MAX_ID kicks in.
[#27011303] Removed redundant "_detail" from field names current_status_detail and project_plan_detail. Pending south migration.
Merge branch 'feature/datafields' of github.com:akvo/akvo-rsr into feature/datafields
[#26502217] Remove translation tagging from gateway app
Changed instances of "project_plan_detail" to "project_plan" in RSR and partner site project_main.html templates.
Changed instances of "current_status_detail" to "current_status" in RSR and partner site project_main.html templates.
Moved South introspection rules out of models and into fields. Created migration file for data fields label changes.
Removed shadow commented-out south import and introspection rules from models.
[#26502217] Edit models.py and admin.py of both rsr and gateway to keep tagging for translation only for the models viewable by Organisation admin users. The models left tagged for translation are Benchmark, BudgetItem, BudgetItemLabel, Category, Country, Link, Location, Organisation, Partnership, PartnerSite and Project.
[#26502217] Resolve merge of develop. dedent() multi line help_text in MiniCMS
[Fix #26502217]A number of small fixes mostly to templates, to make translation work easier. The Dutch and Spanish .po files from this commit are sent for (re-)translation
[#26502217] Fix bug in feeds.py. Create new .po files for nl and es
Added different makers and removed some dead code

. #113
[#23633289] Added a deploy_release_candidate.sh script to automate the release candidate deployments.
Renamed Project.name to Project.title.
Added migrations for Project.title to 0010 migration.
project.name -> project.title in RSR project donation templates.
project.name -> project.title in RSR widget machinery templates.
project.name -> project.title in remaining RSR project templates.
project.name -> project.title in SMS notification templates.
Fixed translation string in rsr/project/project_directory.html.
project.name -> project.title in widget templates.
Fixed rogue string reference to project "name" instead of "title".
Changed instances of Project.name to Project.title in admin.
Updated Project.name -> Project.title in migrations 0012 and 0013.
Updated migration 0011.
Add pretty printing command to perms_migrate
Merge branch 'release/2.0.5' of github.com:akvo/akvo-rsr into release/2.0.5
Fixed Project.__unicode__ to refer to title instead of name.
Merge branch 'release/2.0.5' of github.com:akvo/akvo-rsr into release/2.0.5
Added v2.0.5 Fennel placeholder to RELEASE_NOTES.md.
Started fleshing out RELEASE_NOTES.
[Fix #28126391] Update perms_migrate.py script and permissions_data.py and move them to the akvo/scripts dir. Add display of permission in the Groups admin list page.
save note duration and reuse the next time a note is added
needs cleanup but now we can arbitrarily add rows to the score
Map + dbpeida
port + 100
Share -> Box
manual step
在JS对象中添加了部分控制窗体的方法

可以通过JS来实现窗体的最大化、最小化、改变大小、关闭以及隐藏。
・Donutのオプションのツールチップテキストの読み込みをmsxmlからboost::property_treeに変えた

・ページ内ドラッグドロップを有効にしているときタブをページ内にドロップすると無効なタブが開かれるバグ修正
・検索バーで検索時開かれるタブは常にアクティブになるようにした
・Donutのオプションのタブバーのマウス操作のコンボボックスが実際に設定されているコマンドを表示してないのを修正
・アクティブなタブを閉じたときの"MDI標準"を廃止
・xmlLiteを使わないようにした
boost::functionをstd::functionに、boost::regexをstd::regexに変えた効果かreleaseビルドでできたバイナリが100kbほど減った
updated oak page fonts to be bigger
Unnecessary uniqueness & force mapping has been removed at BacktraceCleaner#add_gem_filters
Merge pull request #5708 from romanvbabenko/refactor/add_gem_filters

Unnecessary uniqueness & force mapping has been removed at BacktraceClea...
Fix typo
Merge pull request #5713 from bolshakov/master

Fix typo in "dasherize" description
minor elsif/else typo fix
Merge pull request #5723 from tiegz/minor_fixes

minor elsif/else typo fix
use File.binread to pull in the schema cache
DATABASE_URL allows omission of database.yml
the file update checker now also detects removed files
Ajax creating user. templates are replaced
Changed fetchMessage to createMessageStream, added comments
patch TurtleQNamesTestCase to use format factory and manager factory registry
Fix for MissingImportTestCase and RioParserImpl
Removed dead code: function rdbSaveTime() is no longer used since RDB now saves expires in milliseconds.
OO .xml-parsing, Unterstützung mehrerer Feedtypen
Add tar task
Don't need to sed-out options for travis any more.
personal session list sync done
Tolerant mode: ignore catch variable name restriction.

http://code.google.com/p/esprima/issues/detail?id=228
Remove `:disable_with` in favor of `'data-disable-with'` option from `submit_tag`, `button_tag` and `button_to` helpers.
Set the primary key during #copy_table if necessary. Fixes [#2312]
Use merge! instead reverse_merge! here
Merge pull request #6186 from anydiem/fix_unconventional_pks

Set the primary key during #copy_table if necessary. Fixes [#2312]
add tests and external file backtrace for Routing::Mapper#draw
Merge pull request #6317 from korny/routes-draw-backtrace

add tests and external file backtrace for Routing::Mapper#draw
support reading port from the environment instead of the config file
Created Class for CSV to HTML conversion
Added calibrator dialog.

Signed-off-by: Andras Wacha <awacha@gmail.com>
fixed issue from first comment on www.yiiframework.com/extension/awegen/
updated README
by default, ssh agent is not created
- Removed Space.vim plugin
- Some changes in mappings
Commited what I've done so far
Change README rst headers style
Correct path for sphinx-doc's automodule directive
Add landing page for html documentation

Use this as a landing page for the html documentation for navigating to
other versions and/or languages of the generated docs.
Handling of all building stuff via the Makefile

Add install, uninstall, mandoc and clean commands.
Let 'make doc' create all multilingual html documentation and the
landing page and move them to a $version/$lang>/index.html directory
layout.
Add man page
Added menu and local storage examples
Added week 5 final code
Added week 6
Added week 7
Added jQuery UI
Making sure week7 is in
Merge branch 'master' of https://github.com/rioleo/CS147
Added week 8 material
Merge branch 'master' of https://github.com/rioleo/CS147
hmm
Give directives as to how to use this repo.
Disable caching.
Remove lint.
Add batch loading.
Merge pull request #35 from basho/csm-adapter-changes

Find in Batches, Disabled Caching Adapter
Add output for enumerators.


git-svn-id: https://root.cern.ch/svn/root/trunk@47200 27541ba8-7e3a-0410-8455-c3a389f83636
Print a type for enumerators.


git-svn-id: https://root.cern.ch/svn/root/trunk@47202 27541ba8-7e3a-0410-8455-c3a389f83636
Allow printing of individual rules


git-svn-id: https://root.cern.ch/svn/root/trunk@47203 27541ba8-7e3a-0410-8455-c3a389f83636
Deleted a bunch of useless stuff
working ant and coala
Merge branch 'master' of https://github.com/belczyk/Robbo

Conflicts:
	trunk/Tatooine.v11.suo
	trunk/Tatooine/Scripts/Game/EnvironmentContext.min.js
	trunk/Tatooine/Scripts/Game/EventAggregator.min.js
	trunk/Tatooine/Scripts/Game/GameLoader.coffee
	trunk/Tatooine/Scripts/Game/GameLoader.js
	trunk/Tatooine/Scripts/Game/GameLoader.min.js
	trunk/Tatooine/Scripts/Game/MNeighbour.js
	trunk/Tatooine/Scripts/Game/MapLoader.js
	trunk/Tatooine/Scripts/Game/MapLoader.min.js
	trunk/Tatooine/Scripts/Game/Mixins/Animatable.js
	trunk/Tatooine/Scripts/Game/Mixins/Animatable.min.js
	trunk/Tatooine/Scripts/Game/Mixins/AssetLoader.min.js
	trunk/Tatooine/Scripts/Game/Mixins/Blowable.coffee
	trunk/Tatooine/Scripts/Game/Mixins/Blowable.js
	trunk/Tatooine/Scripts/Game/Mixins/Blowable.min.js
	trunk/Tatooine/Scripts/Game/Mixins/Walking.min.js
	trunk/Tatooine/Scripts/Game/Objects/Ant.coffee
	trunk/Tatooine/Scripts/Game/Objects/Ant.js
	trunk/Tatooine/Scripts/Game/Objects/Ant.min.js
	trunk/Tatooine/Scripts/Game/Objects/LaserBeam.min.js
	trunk/Tatooine/Scripts/Game/Objects/Robbo.min.js
	trunk/Tatooine/Scripts/Game/TimeDelayedMethodCall.min.js
deps.js tech: Fix serializing of empty deps, add tests
deps.js tech: Fix twice expansion of deps

Close bem/bem-tools#163
- more sync tweaks in deps.js
Contribution minor grammar fix
docs template dir
Added .prepNode and .prepStage test
Bumped minor version and date
Added default member values for .prepNode and .prepTree
v0.3.0 - minified/gzipped (5.5K/2.3K)
First commit
Merge github.com:benedya/bahar
Ask user before restoring item from localStorage
Some notification cleanups
Fix rendering of block formatting button
Slightly nicer-looking focus mode editor toolbar
Make the 'restore?' gialog fit with the visuals
Handle all restorable items in a single dialog
Enable collection views only when making their owner editable
Add preliminary openscad support.
Introduce openscad snippets
Typofix in cube() openscad snippet.
Custom snippets added and modified
Paste and copy from system clipboard.

And remove gist copy-pasting; since I don't use it.
gitignore spellings
Fix deprecated Indy#for(:all) comments
implicit relative import
Naming conventions in DB
Twitter stuff
Merge branch 'master' of github.com:bilalq/DataVu
Changing order of urlparser loading after notemod makes both work..... idk
Not sure if this check is necessary but adding anyway
Switch from google IG API to wunderground API
Add colors for stock module
Notice user when a note is added instead of  msg channel
Change column type of karma mod
Close model session on exception
Remove pdb
Change regex, added some non-catching groups
Fix event/module handlers, was using wrong key so that event type was being used as a key instead of the module name
add a stubby apache class which just makes fogcon our default vhost
kalua: comment to nf_conntrack_max for lowmemdevs
kalua: using new wifi_stats in monitoring
kalua: watch: webserver: use robots.txt if possible, fallback to favicon.ico as test-fetchfile
Updated for Kinect cloud
add feedback email template
made movements more responsive by drawing immediately after events
A basic Cucumber setup: plugin added to BuildConfig.groovy, a CucumberConfig.groovy file, features, step_definitions, and a single unimplemented feature.
We have a successful authentication scenario against Spring Security!
Tiny tweak -- we weren't actually using the argument from the scenario
Fixing some parameter names related to CreateRoute, ReplaceRoute.  Fixes https://github.com/aws/aws-cli/issues/13.
HSP.alignment_annotation is now sliced and transferred by HSP.__getitem__
Update row parsing in hmmer-domtab
Update blasttab constants and docstring
Refactor blast-tab main parsing method
Put PKGBUILD under directory
Updated username to just use first name in claim
Uhhhhh

Added .gitignore
Fix issues parsing some messages

I ran this tool on the Git repository for Git, and found some issues
with names and messages I hadn't encountered previously, so fixed that.

Also, removed the "formatting" of JSON Arrays in the HTML output.
There really isn't any need to format the output.  It just makes the
file bigger.
This is the fixing of the parsing…
Change readme file to use markdown