labofsahil/github-event-dataset-2012 huggingface dataset:
add mapping support
Merge branch 'master' of https://wenshao@github.com/AlibabaTech/druid.git

Conflicts:
	src/main/java/com/alibaba/druid/mapping/MappingEngine.java
	src/test/java/com/alibaba/druid/bvt/mapping/MappingVisitorTest.java
updated RouteMe.h to include all existing headers
Merge pull request #81 from mapbox/unified-header

update unified header
gana madrid
Moved to GraphicNote
Update midterm-essay.docx
Sending activation e-mails, account disabled after register, new
user role set to "USER"
Fully working activation emails
freebsd template
Map field unlimited cardinality bug fix
Code commented
Removed sisyphus from code base
Merge pull request #95 from nlake44/remove_sisyphus

Removed sisyphus from code base
add images losed
Eric tells his story about Anne
cleaned up dependencies, bumping to 0.10.10
adjusting gemspec demands so the clusterfuck of version constraints running around the chef world can sort out
Regenerate gemspec for version 3.1.6
unbreak logging to file

Change-Id: I5a66c9837e7f3a43ebe02a6e81fa1cea2ebd8e82
v2 update! will now merge diff into hash arg

this makes it so this flow works with 1 request:

    app.foo = bar
    app.start!

Change-Id: I31bfe062c3b4d1b777297bf73b58ba9d97e7879b
add v2 app console attribute

Change-Id: I85bbad49098b689fd25d22f207e53d790bf0aac5
bump to 0.3.38

Change-Id: I765381e8418343d72c90a0b7feb2e82458dc77d2
Updated for 
Updated for 0.4.3
AdminARM and Server done 4
Exit photographie, welcome inspirations
QueryDSL compatibility fixes...
Apply more conventional coding stanards.
Neuladen der statischen Inhalte nach Planetenwechsel
(für richtige Bauzeiten in der Werft u.a.)
Убрал проверку на date,которое генерирует непонятное исключение
Replaced backslashes in directory names in the README file. Weren't rendering in reStructured Text.
Rename some methods, initialise an empty table to house crew
insignificant commit, trying to work out gh-pages not using css file.
shrinking down measure size
don't show ranking in iframe
https://dev.mimuw.edu.pl/issues/1959
Merge branch 'master' of github.com:Buzdygan/ai-arena
Add and Edit Antibodies validation complete
Merge https://github.com/CSPshala/BeatWars

Conflicts:
	Phat Beats/source/States/CCredit_State.cpp
Updated to support the current stable channel(442) and not only the alpha version(459).
Merge pull request #1 from assaframan/master

Updated to support the current stable channel(442) and not only the alpha version(459).
panel content map form styles fixed
share url format fixed
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop
Upgrading vizzuality-sequel-rails to 0.3.5
globalerror is now back
seperate html fragment
Forgot break; lol
Updated dialogs and added a stylesheet file
Changed visacard info
Merge branch 'master' of github.com:Chiru/ChiruAddons
tweaked momentum scale so that high angle dashes keep more initial momentum
Restructuring, fixed fireball issue.
Fixed a few small issues.
Added metrics and new update method.
Development versions don't use auto-update system.
minor quick start fix
Removed "Hello World" text from default activity.
adding exec so it will be used in the run-it better
add ENVS_DIR to config module
Updated Readme with controls. Added bg.h
Fixed the last javadoc warnings.
Converted coffeescript to python. :P
Bug fix : Variables set in wrong order
fixed mixed image formats bug
Collection objects and drush tweaks
Enable compression on static files
Working on the abstract folder.  The purpose of this is to lazily load files from disk, rather than loading all files exactly once.
Minor tweak to the build.xml files to workaround a wierd bug related to package-info.java files.
explicitely add cdi-api to the Weld dependencies for better IDE support

Idea and Eclipse fail to properly detect this dependency from the weld-bom
thus they fail to compile properly in the IDE when the -PWeld profile
is used. So we add this explicitely (despite not really needed for maven)
DELTASPIKE-232 explicitely make generated bean Serializable

This might be needed for some containers as our bean is
@Dependent scoped. It doesn't hurt at least...
DELTASPIKE-215 fix ProcessAnnotatedType declaration
Графика: Обновлены основные кнопки и файл "кнопка с текстом"
Merge branch 'master' of github.com:Dem0n13/Evolution
Fix empty directories and sitemap bug fixes

Исправлены ошибки при создании Гугл sitemap.
Обнаружены не добавленные в репозиторий папки, из-за отстутствия в них
файлов. Папки добавлены.
Добавлены настройки длины заголовков, соц. кнопок и рейтинга в статьях.
Fix: Bad assignation of const for pdf delivery module name
Fix: Bad assignation of const for pdf delivery module name
Fix: Bad assignation of const for pdf delivery module name
Fix: Bad assignation of const for pdf delivery module name
Merge pull request #345 from simnandez/3.2

Fix: Bad assignation of const for pdf delivery module name
Fix: The bottom margin is already included into heightforfooter
This provide 1cm more for product description.
Qual: Removed duplicate template (nearly no difference between sirroco
and typhon, so no need to keep them both).
Qual: Some changes to use more efficiently bottom of page when there is
several pages (we don't keep space for total on all pages, but only last
one)
[ticket/11103] ACP option to enable/disable notifications output in header

PHPBB3-11103
[ticket/11103] Remove notifications to posts/topics when they are deleted

PHPBB3-11103
[ticket/10885] Fix UCP Main Error if no forums exist

An error is caused by an empty set passed to sql_in_set

To fix the error, do not try to run a query to load the
global topics if the user cannot read any forums.
(fix the problem, plus save a query!)

PHPBB3-10885
Added sinatra-activerecord
OEP-8622
OEP-6982 unit test
OEP-6982: Fixed up the new unit tests a bit.
OEP-2025: Fixes broken nested record architecture.

This reintroduces reverted commits and further modifies the functionality of
the SC datastore framework (specifically related to nested records/stores).

It fixes the inherent broken nature of the nested record architecture, which
had been the cause of memory leaks, data corruption and all manner of odd
behavior in the datastore layer.

This is a large commit with many changes.

Unit tests have been added to cover new functionality, and existing unit tests
have been updated to reflect the changes.

All tests are currently passing.
[Delivers #38405725]

:+1:
Added driver file for IR sensor.

So we don't have to set an extra directory.
Updated code for team 6121

And adapted it! :D
Revert "Updated code for team 6121"

This reverts commit cc46006f8f5774724beab2b4f5d9e8ccdfc3dfae.
Fixed header file overlap

created "-6121.h" headers for everything. :D
Updated 6121 sensor/servo/motor configuration

Accidentally deleted last time the commit was reverted.
Added Plan B (for autonomous period)

Not calibrated yet.
Added Plan C

It won't do anything! :D
Made lift resetting work.

It works for no reason at all now!!! :D
General debugging. NOT WORKING :(
Switched task to void
Estimate of rotation values
Added tele-op code

also reconfig'ed servos/sensors/motors
Merge pull request #32 from Ernest314/development

Development
On second thought, drop magenta from meat coloring.
Try out some new stuff for the cave layout. It'll have walls eventually, I swear...
Cave walls
Don't spam players with the actions of non-players.
Comment out the debug print for a while; it's getting spammy.
Fix an off-by-one and change some comments.
Scroller component.
Move the character sheet into actor, and change printing of it a bit.
Fixed COPYING to LICENSE
Merge pull request #30 from eaescob/master

Fixed README file
implement equals, reorganize methods
Removed trajectory_analysis.tex from master.
Added intro and some comparisons

LEJOS + GNAT tilføjet
correcció domain + traducció del nom de les classes
tradució dels noms de les classes
noves traduccions i neteja de literals
Revisió dels estils
- blöcke behalten alte Farbe nach mouseover...
htmlentitied & in jstn's bio
removed allowfullscreen iframe attr as a test
removed width attrs on iframes
rename SimulationInput -> SimulationSetting, like its Java counterpart
Add a test for the save action on the circuit servlet.
Merge branch 'master' of github.com:FelixAkk/synthbio
German documentation for Rotary Poti Bricklet added.
Added dummy __init__.py file.
Fixed setup.py, again.
Chg rebase 2 dans master
Chg kool branch kool test rebase
Add label and recipe.
fonction de generation de pass
some basic aliases
Save main config array, set connections as persistent by default.
modified author names
Only one LAD_connect() per process

Allowing concurrent access to LAD from each thread of a process proved
too costly and complex, so NameServer_client.c was changed to allow
multiple threads to sequentially access LAD.  This support comes in the
form of a mutex that is taken before sending a commang to LAD, and released
after receiving a reply.

MessageQMulti.c was changed to do just one LAD_connect() (instead of one
per thread).
LAD: Upped the max number of simulatneous client from 16 to 32.

This was required to get MessageQMulti to pass with 20 threads, in one
instantiation of NameServer.

Current intantiations will use the same command/response pipes for all
threads in the same process, so now the limit will be 32 client processes
to LAD.

Signed-off-by: G Anthony <a0783926@ti.com>
Test:  Removed ifdef'ed out sleep code in MessageQ tests.

Signed-off-by: G Anthony <a0783926@ti.com>
Test:  Removed the chatter from the API modules, and the MessaegQMulti test.

This in lieu of decision to move to OSAL Log_printf, which will allow the
chatter to be controlled at least on a per module level (hopefully).

Signed-off-by: G Anthony <a0783926@ti.com>
plus
add sound
2012.11.08 v0.1
no Changed
Maked Proguard
Merge remote-tracking branch 'origin/origin/master'

Conflicts:
	bin/classes/BitMaker/Base/BitMakerView$BitMakerThread$1.class
Make AdMob
Prepare for sub-byte bits. Fix clamping on images with color palettes.
Integrated new submissions
More games for #1
* Adventures of Shuggy - Contributed by Arc Angel
* Black Mesa - Contributed by Frozer
* Borderlands 2 - Contributed by Arc Angel and simtech76
* Hector: Badge of Carnage Episode 2 - Contributed by Arc Angel
* Hector: Badge of Carnage Episode 3 - Contributed by Arc Angel
Contributed by GameSaveManager
* Age of Wonders II
* Anna
* Arx Libertatis
* A Valley Without Wind
* Bang Bang Racing
* Crazy Taxi
* Dirt:Showdown - Disc info
* Dragon Age: Legends
* East India Company
* Europa Universalis 3
* Gorasul: The Legacy of the Dragon
* Hack, Slash, Loot
* Inquisitor
* McPixel
* Mercenaries 2 - New vista path
* Minecraft: Technic
* Need for Speed: High Stakes
* Portal Prelude
* Pro Evolution Soccer 2013
* Puzzle Kingdoms
* Rune
* Shad'O
* Sleeping Dogs - Added disc path
* Spider-Man: Friend or Foe
* Starship Titanic
* Take On Helicopters
* Torchlight II
* UFO Afterlight
* Victoria II
* Worms Armageddon
* Xenonauts
* X-Men: The Official Game
Create spec for commands in messages
Message#executable?
Message#execute!
Replace with that of the master branch
Fixed bug where CPUs higher than single digit were not found properly
Set field cardinality to 1
Showing original revision on inventory admin.
Reloading extras.
Setting the "missing" reference.
Removing the old missing field.
Commenting out halting test.
using iframe and start to make content
update9/5/12
bugfix in build.xml
Merge branch 'refs/heads/424_evaluation_videos'
first bbb
delete yyy
Revert "first bbb"

This reverts commit e18f72cf570308585fa488294dda312dc0bf8629.
first created. bloodpressure as template
Create link on landing page
Some style improvements
Add functionality to display the task tree
Use a mock for the task tree when no connection
Use a mock for the task tree when no connection
Update TODO list
Update README documentation
Merge pull request #5 from J-Hannes/feature/004_autotool_task_list

Feature/004 autotool task list
Fix #417 - Header buttons not working in FF.
Add an option to force sync scrolling.
Minor cleanup.
Add an "active" CSS class to the active row.
fixed bug where ancestor-bindings were not removed in case the
canvas-element is detached from the dom before the grid-instance is
destroyed
fixed missing space when applying 'active' class to row
fixed formatting
Merge pull request #431 from ClemensSchneider/active_row_class_fix

Missing space for 'active' class of active row
Merge pull request #430 from ClemensSchneider/safe_ancestor_binding

fixed bug where ancestor-bindings were not removed
BREAKING API CHANGES

New events:
+ onBeforeHeaderRowCellDestroy
+ onHeaderRowCellRendered

Renamed events:
  onHeaderRendered -> onHeaderCellRendered
  onBeforeHeaderDestroy -> onBeforeHeaderCellDestroy

New methods:
- setTopPanelVisibility
- setHeaderRowVisibility

Removed methods:
- showTopPanel
- hideTopPanel
- showHeaderRowColumns
- hideHeaderRowColumns
Fix #432 - check hasOwnProperty() in for (... in ...) loops over arrays.
No need to namespace events on elements that we remove on destroy.
Fix #428 - scroll the main area when the header row is scrolled.
Fix #376 - size the header row spacer to the right width
Fixed #417 - checkbox select column handling for empty grids
Fix #420 - removed an unused option
Merge remote-tracking branch 'mleibman/master'
Renamed packages to conform to Java package name conventions.
updating models and adding text fields to meals, workrouts, and commnets
added com_site profile
added com_site profile for real
Refactoer some specs
Ho aggiunto una guida all'installazione del database MySQL e all'esecuzione del programma.
Rewind is now considered in beta

Tests coverage is high enough.
Add keywords to `setup.py`
Renaming `logbook` to `rewind`

Logbook was a the former name of rewind.

Tests currently fail.

[ci skip]
Renamed all references to `logbook` to `rewind`

All tests pass.

This commit fixes issue #20.
Merge branch 'logbook-to-rewind' into develop

* logbook-to-rewind:
  Renamed all references to `logbook` to `rewind`
  Renaming `logbook` to `rewind`
final beta

+ push
+ sound
+ ru localization
+ icon
+ captcha fix
A first attempt to make compiling with disabled graphics and/or disabled audio working. Next, make null device graphics work and make sure null device audio also works with the new build script
Fixing problem with -DUSE_SDL_AUDIO flag not being set
Adding missing logging file
added header
Merge branch 'master' of https://github.com/JoseCrooz/nothing
added header
Lets wrestle with reSt shall we.
Revert "uh"

This reverts commit f50dcd84b61aed88d03e59930c979af31eff3ff8.

Conflicts:

	src/game/server/gamecontext.cpp
Basic generation of people and dossiers.
Added users microposts - 3 errors when running full test
Add USB app
fixing fit bugs
Minor changed in File structure...
Merge branch 'master' of https://github.com/KevinGregull/GLFX.git
typo
Merge commit 'ab02'
added config parameter for plausibility threshold
removed old/outdated comment
GPL license
Removed unnecessary junk from ToggleMouse
Configured NERDTree for even more awesomeness.
Added highlights for vimdiff
Regression: latest module stopped working because of an incompatibility
Merge pull request #1169 from mahagr/master

Regression: latest module stopped working because of an incompatibility
First implementation of DTLS

This version is the result of preliminary works and is not secure.
The Pre-Shared key is hardcoded waiting for a better negociation
algorithm.

First benchs are not that good as latency increased dramatically.
libdxfrw: bug & ellipse in V12 & dimstyle V12
Merge branch 'master' of github.com:LibreCAD/LibreCAD
Week 2 Work

Basic back story and ideas for traps
deleted ruby branch files
added ability to create a node
fixed value allocation bug in prepareNode()
Added a small game called 'alleneun'.
Initial MAEC Bundle 3.0 bindings commit
Updated for renaming of ActionType to MalwareActionType
for fun

haha
Revert "for fun"

This reverts commit 49ccc7b9c2e8313ba6fc51f5921e37edef72577b.
what the

da
Adding characterisation of the prime implicates for sat_genhorn_cs(k,l).
Started move for resolution-methods related to prime-clauses.
Updates after move of "PrimeImplicatesImplicants".
Improved organisation.
Update of links after move.
Editorial improvements.
Editorial improvements.
Implementing a new "best" method computing all prime clauses for arbitrary F.

MG, please note. There are also quite a few more methods in the literature.
Trying to improve prime_clauses_cs(F).
Maxima-sort is (now) guaranteed to be stable.
Provided computation of p-hardness.

Also improved implementation of hardness_wpi_cs; MG, please note.
Editorial correction.
Added further testcases regarding (p-)hardness.
Discussion of an example where a 2-CNF has a better representation using new variables.
Adding reference for 2CNF encoding of AMO constraint.
Improved discussion of amo-translations.

MG, please start an investigation.
The irredundancy should be checked experimentally.
Shortestness should come later (once the Chang-method has been
implemented).
Removing duplicated clause from description.

x_n -> -s_{n-1} is the contrapositive of s_i -> -x_{i+1} for i = n-1.
Adding sequential counter AMO constraint translation.
hack007
Navigation Flow, Services and new Pages

Modified several services and Entities to allow nullvalues. Created
extended entities to be able to get missing information. Added BingMap
Task to event details. Added the TrackingService and Tracking Artist
feature (Page, ViewModel and Basic Integration). Added the
CalendarPivotPage and its user controls. WG Update (SettingService)
Verwendung: Optionen zum Ausführen beschrieben, -v fehlt noch
Merge branch 'master' of https://github.com/Malkavian/UMachVM

Conflicts:
	doc/Usage/tex/UMachVM-Verwendung.pdf

test
interface edt
Add support for Opera's scriptStorage with $.delete, $.get and $.set. Close #503
break up if condition
use key instead of e
meta
derp
description
Merge pull request #523 from aeosynth/key

slight refactor of keybinds; meta
Nathan Green - HW4, additional functions added
User stories for in-class lab
Поправки xxx1
fix tests

--HG--
branch : even-more-jit-hooks
eroare DarkBox
minor gae changes.
#92 Agregando un 'loader' a la petición por Ajax
- some color-correction
added a deployment file rerouting the root into src
Rename unit test module for the "math".
Mere om bacon
Removed id of ReservationItem
Added JDoc SEE to Reservation/IReservation
Added JDoc SEE to Address/IAddress
Added JDoc SEE to Guest
Added JDoc SEE to Party/IParty
Added JDoc SEE to Option
Added JDoc SEE to ResItem/IResItem
Added JDoc SEE to Category/ICategory
Added JDoc SEE to Room/IRoom
Added JDoc SEE to Habitation/IHabitation
Added javadoc to all of the persistence classes and removed commented out conversion methods
Fixed conflicts when pulling dev to peristance (locally)
Merge branch 'dev' into domain

Conflicts:
	src/at/fhv/roomanizer/domain/Habitation.java
	src/at/fhv/roomanizer/domain/person/IParty.java
	src/at/fhv/roomanizer/domain/room/Category.java
	src/at/fhv/roomanizer/domain/room/IRoom.java
	src/at/fhv/roomanizer/domain/room/Room.java
Fixed conflict in AddressEntity
Changed database to roomanizer_timebox2
Merge branch 'dev' into domain
Gradle Release Plugin - new version commit:  'exhibitor-1.3.3-SNAPSHOT'.
un-inlined receive_response
removed benchmark files from project
removed unused class `singly_linked_list`
categorized examples
fixed arg names in error messages
fixed output of help text for program options
maintenance and documentation of group chat
pattern matching improvements

this patch adds a new `match_split` function to split a string and match the
result, renames `on_vopt` to `on_opt0` and `on_opt` to `on_opt1` and adds
documentation to opt.hpp
code cleanup and documentation
documentation
documentation
fixes due to latest changes in opt.hpp
shutdown function no longer waits for actors
documentation
updated documentation
removed single_reader_queue::not_empty
more consequent move usage for delayed messages
got rid of Boost.Thread dependency

libcppa actually didn't use Boost.Thread for quite some time now,
this patch finally removed the dependency from CMake project file
use per-thread recursive_queue_node caching

this patch replaces the per-actor caching of `recursive_queue_node`
instances with a per-thread caching strategy that also allocates
nodes more efficiently
clarify dependencies

added Pthread dependency and marked Boost.Context as optional
added new intrusive_fwd_ptr smart pointer

this implementation can be used with forward declarations and is
implicit convertible to intrusive_ptr
implemented basic protocol commands and buffer writing
support for inheritance in WxxClass
support for storage in namespaces of its contained classes
minimal support for inheritance and improve operator new
Fixed: WEBDL-480p being detected as WEBDL-720p

Fixed Newznab DNS hostname test, finally!
Damnit IE, you suck

Fixed: IE trying to save/open json result in settings
Empty allowed release group can be saved
[change] Using opam wiki as a git submodule to generate documentation
[fix] Fixing the depth of the homepage link on subpages (OPAM is now pointing propely to the root index)
[cosmetic] Making the search input look a little better
[add] Adding module Markdown_github to be compatible with OPAM Github wiki (code blocks fixed, compared to original Markdown
Merge pull request #8 from venator/master

Adding a Markdown_github module, and pulling directly OPAM wiki repo on Github
Do not display base-packages in the top10
Display package version in the stats
Function: new "idempotent" field to know if a function can be called also using HTTP GET method

git-svn-id: http://orient.googlecode.com/svn/trunk@6621 3625ad7b-9c83-922f-a72b-73d79161f2ea
Minor: added position information in case of exception on query parsing

git-svn-id: http://orient.googlecode.com/svn/trunk@6622 3625ad7b-9c83-922f-a72b-73d79161f2ea
HTTP: allocation command now check if the storage is local, otherwise throw an exception

git-svn-id: http://orient.googlecode.com/svn/trunk@6623 3625ad7b-9c83-922f-a72b-73d79161f2ea
Fixed issue #1059 about SQL: fixed bug on NOT operator

git-svn-id: http://orient.googlecode.com/svn/trunk@6759 3625ad7b-9c83-922f-a72b-73d79161f2ea
Fixed issue on multiple client channels. Now by default the network channel pool is to 5, while before was 1!

git-svn-id: http://orient.googlecode.com/svn/trunk@5195 3625ad7b-9c83-922f-a72b-73d79161f2ea
redirection /gplus vers notre page google plus
Merge branch 'master' of git://github.com/mozfr/www
Merge pull request #25 from pascalchevrel/master

redirection gplus vers googleplus
mise à jour lien geckozone dans ongle
Merge pull request #26 from pascalchevrel/master

màj lien geckozone dans onglet
Updates comment view styling to gray background
Adds links routing and links model with validations
FIXED: bug in feature 'local function' in preprocessor
use gh-pages for logo
ScreenNavigation updates

ScreenNavigation updates
dot.gitignore: Include some more extensions

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
desktop/cairo-compmgr: Fixed underlinking and REQUIRES
desktop/cairo-dock: Patched for glib 2.32+
libraries/gtkhtml: Patched for glib 2.32+
libraries/libdmapsharing: Patched for glib 2.32+
system/tilda: Patched for glib 2.32+
network/gq: Patched for glib 2.32 and gcc 4.7
network/openvas-scanner: Removed (FTBFS)

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
network/openvas-administrator: Removed (FTBFS)

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
network/openvas-libraries: Removed (FTBFS)

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
network/openvas-manager: Removed (FTBFS)

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
network/openvas-cli: Removed (FTBFS)

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
network/openvas-client: Removed (FTBFS)

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
network/greenbone-security-assistant: Removed (FTBFS)

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
network/gsd: Removed (FTBFS)

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
libraries/Botan: Fixed python path

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
libraries/Nevow: Fixed python path

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
libraries/xmpppy: Fixed python path

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
misc/weather: Fixed python path

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
python/gerbmerge: Fixed python path

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
bug with cursor position when colorized, remove color on prompt
demo code was changed to use colander.Set instead of deform.Set, so we cant rely on allow_empty=True default to present us with a required
allow site title to be changed
Added checking in the export_submit handler to deal with empty array returned by components
Plugins: Calling unload() on app shutdown.
backstage add cat
inner file change
Merge branch 'master' of github.com:RakshitJoshi/test
Add tag to company
Merge branch 'master' of github.com:RasoTeam/platform

Conflicts:
	db/schema.rb
Allow player to auto-grab the zipline, using the jump key to release.
Update readme to reflect updated controls and organizational structure.
Fix .desktop file generation

I don't know why, but that's how it's done in other places!
More Heroku hoops
Queries output is now handled by format().
预编译gem
added folder for vamosi_heard project
Update ejbs/cadastre/src/main/java/org/sola/services/ejb/cadastre/repository/entities/SurveyPoint.java

Fixed node linking issue [#208 state:fixed responsible:none]
Consolidating topology selection
Refactoring tcp parcelport allowing for different types of parcelports
Copyright fix
commenting out the section Hartmut added; it breaks in distributed
bumped version to 0.4.5
[2508] Remove combat door for Chromaggus - this is not used
[2509] Remove script for npc 2708. Will be handled by DB

Signed-off-by: Xfurry <xfurry@scriptdev2.com>
[2510] Remove script for npc 4488. Will be handled by DB

Signed-off-by: Xfurry <xfurry@scriptdev2.com>
[2511] Remove script for npcs 11056 and 11057. Will be handled by DB

Signed-off-by: Xfurry <xfurry@scriptdev2.com>
[2512] Remove script for npc 20201. Will be handled by DB

Signed-off-by: Xfurry <xfurry@scriptdev2.com>
[2513] Cleanup and improve script for the Bug Trio
[2514] Implement script for Pyroguard Emberseer
Merge branch 'master' of https://github.com/scriptdev2/scriptdev2
[sd2_mr0390] not needed stuff
[2515] Cleanup boss Huhuran (AQ40)
[2516] Add support for npcs that should be only interactable while dead
[2517] Improve script for Arlokk

Note: triggered spell 24211 needs to be implemented in core, because it's missing from DBC
ToDo: Add reset code for the Gong when the core will support this properly
[2518] Add missing supprt for Lethon's Spirit Shades

Based on the previous work of Schmoozerd
Merge branch 'master' of https://github.com/scriptdev2/scriptdev2
Merge branch 'master' of git://github.com/mangosR2/scriptdev2
update subs.
WikiPlace: fixes 'pages count' bug
Added localized battle pets type.
added feedback message for cauldron reload
changed filename to .schematic
Finished library support and changed castle function
Revert "second commit"

This reverts commit b014c5a0ae92e986290764a0c91b12e8f3e5f786.
Revert "Revert "second commit""

This reverts commit ee603851039c16e55913d71b4f6f09f9b7b610f8.
Revert "Revert "Revert "second commit"""

This reverts commit a1d29b6b1f3bdeebed43b02f8dfdf0f49e414030.
Revert "Revert "Revert "Revert "second commit""""

This reverts commit 82d7b56e90bf10b10b0e3ce7abd1ca6cb197c540.
Revert "Revert "Revert "Revert "Revert "second commit"""""

This reverts commit 60da48afdac85fdbf6569b41f734221ed326a050.
Revert "Revert "Revert "Revert "Revert "Revert "second commit""""""

This reverts commit 257589a9f5da9a2f88d0e7f27e0f631f5ba5b946.
Revert "Revert "Revert "Revert "Revert "Revert "Revert "second commit"""""""

This reverts commit 40e2b4b830f602b0455c240e9c8590e0d1b90e08.
Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "second commit""""""""

This reverts commit 738eeb99f480c83256007c8402a711fd0a315895.
Basic module loader
SONAR-3596 I18n can search for plugin bundles inside language packs
! can now use pagination
Signed-off-by:James Robson <git@secondsphere.org>
! can now use pagination
Signed-off-by:James Robson <git@secondsphere.org>
! beginning to work on wiki menus
Signed-off-by:James Robson <git@secondsphere.org>
! playing with the menu
Signed-off-by:James Robson <git@secondsphere.org>
! basic menu attempts
Signed-off-by:James Robson <git@secondsphere.org>
Fixed typo in if statement in one of the new methods in TickStage
Added Component for simple gui image.
Signed-off-by: Karang <arthur.hennequin@free.fr>
Merge pull request #380 from Karang/master

Added Component for simple gui image.
Update wyświetlania, dodano mury(EXECTUABLE)

- zmiana kolejności wyświetlania playera i obstacli
- update funkcji debugInit w map (kilka murów)
- zmiana wartości type dla obstacle (kolejność)
- poprawa kilku konstruktorów
- poprawa składni funkcji move w Playerze
- wartości 649 i 346 zmieniono na stałe displayX i displayY (są to
pozycje gracza na ekranie, nie początek układu wyświetlania)
- poprawiono obrzki murów
Continued work on controls etc.
transformation du projet webservice en projet web
smurf: changed default number of to be fitted components to 1.
smurf: Added documentation section on Fit1d
gaia: add the UCAC4 catalogue
- Fixed 1x1 sized items bug.
Added missing function prototype.
Fixed reception of SetTxRate messages.
Merge branch 'master' of https://github.com/Susurrus/Autoboat
Added left panel need to resize and add key listener.
Resetting debug log
Resetting debug log - part deux
Think it's finished?
finished user signup
add SSL in production enviro
*.classpath
gada
Merge branch 'master' of https://github.com/ThomasVyncke/Scio.git
Remove AmPm enum from main API

Fixes #105
Lots of changes in that one
* Added Mac OSX support
* Removing unused lexers from QScintilla
* Fixed warnings in QScintilla
* Static files ending with .less/.css/.js can now be edited
* Removed dead code
Added my individual contribution.
Fixed BUS_CLOCK value
mobile tools added. pourtrait templates created. Pre-Voting.
texture pack test
readme test
Updated Atex

Fixed update problems and added flux identification
Added customstuff, dungeonpack, and mystcraft

couldn't find correct version of paintball mod
Renamed the entry point main() -> run_repobuddy().

Renamed the entry point function from main to run_repobuddy().
Renamed var cmd -> command.
Store the command string more clearly in the error.

Store the command string much more clearly in the GitWrapperError
exception.
Moved the run_tests main() into a new module.

Moved the run_tests script's main() into a new module and renamed the
function to run_tests().
Added 2 more tests for git_wrapper module.

Added 2 more tests for the git_wrapper_module. Also refactored the test
methods into more modular smaller reusable chunks.
splash...
Merge branch 'master' of https://github.com/TxusMaista/Tenguk
Added a basic cloud foundry configuration for the application.
Added event for when a nested container is created. NuGet packages will now be updated on build
This is the code to print out a readable format of the XML file downloaded from a Confluence space.
Revert "[TESTING] Implement SmartPtr part 3, stage 1 v0.5 - rewrite per-unit Aura* links storage." (Not compile)

This reverts commit ec77af594a80eae2d55d95239cb18c8e4cf6158a.
[TESTING] Rewrite Evade system on event-based structure, including StateMgr features. v0.7. related to #1086 and some other. testing.
- found and possible fixed problem with incorrect unsummoning tempsummons.
Revert "implement per-map locking in grid load/unload/access procedure v0."

This reverts commit a77f2e3584d5aff788e9fc52c7ae6f65b1d29070.
implement per-map locking in grid load/unload/access procedure, also in grid object load procedure, v0.2. rename on locktype and some style fixes. related to #1255 testing
Add new POWER API in gr_message block, including four effective powers, and three powers (2 preambles, 1 noise)
Merge branch 'txsync' of github.com:UpYou/grforwarder into txsync
Password changing support.
Actually commit the password change routine.
Make API similar to Django DB model for relationships.
Did some refining to query hierarchy. Added some files.

Signed-off-by: Pamelloes <pamelloes@gmail.com>
Updated: added slider
Rewrote the responsive sizing of slides. Much better now for skinny sizes
Update documentation to include new embed, font options and maptypes
Changed to new embed method
Made nrpe init.d script more robust.  It no longer depends on killproc which doesn't exist on CentOS and all operations are now idempotent.
2 equations identiques (correction du probleme de signe)
Introduce fallback hell
We don't need the full DataView, just Uint8array
Make Uint8array pass through prefixed
Firefox hates blob urls :(
I hate blobs
Fix Modernizr tests
Well that was foolish
Fine, explicitly set Modernizr.blob.creator
Forgot Jterniabound.js
Properly clean binary response for loading = 1
Typo'd (Having to push each small change is embarrassing)
Don't break the stack
Debugger should use console.debug instead of this.console.log
Move xhrblob & xhrarraybuffer tests to Sburb.testCompatability. Fix broken loading methods, warn when loading method = 0
Simplify Debugger audio test
Merge pull request #98 from Fugiman/master

Make File Loading reliable for browsers up to IE 5
Simpler names for samples.
Datenbank Model veraendert
try/except reported and assignee
removed crap images
deleted unneeded views
icon sizes
Added some twitta icons and a path free version of logo.
unused tests were removed
test name was corrected.
Uncleaned header Text-Image
successfully add sass features and bootstrap
fucked with some stuff, didn't get rewrite working at work
Dragable table + settings icon
Update sql/LoCEMU/README.md
Added constants and started writing parsing code
README: installation instuctions
refactored and fixed
fix
Added all controllers and all views. Missing link between tables
Full excel import into Inventirap #83
added tests for signup success
updated create action with a save and a redirect
added flash variable to the site layout
added test for a flash message on successful user signup
added a flash message to user signup
all done with basin hopping, data present was used in report
develop .
Fix typo in README
Add Sconstruct For Build method.
Add ut/it flags
Add gitignore
merge from reyoung branche.
Updated users controller

+ Added users/_user_row
+ Added users/delete
+ Added users/list
* Updated users/view to include role and actions
Added register form

+ Added register form
Merge pull request #1 from adaedra/devel

Integration of user controller
remove default configuration option
Adding DNSimple updater
Don't need dwc_otg_cmd_t
Complete the root interrupt via a softint handler.
Add some more fields from FreeBSD softc
Add the FreeBSD copyright
We're a high speed hub (I think)
Random DPRINTF adds and build fixes.
Installation instructions for command-t
disable the __init__.py magic to make Werkzeug 0.8.x work with the PyInstaller
1) Created Graph API call to get the event details by using event ID.
2) Handled the event details screen with user profile and message comments data as well.
correct sudo invocation of backgrounded commands. review comments, tidy method names.
tidies to test and logging
routines to advertise the local InetAddress and obtain ports in a shareable external way
don't fail on null whirr cluster name
fix poms to match dir names, include sql appropriately
Now with basic support for parameters filtering
v 0.2.0
Use ack with the customized find-file-in-project
Proper way to use the new ffip
Added new method to test URL specifically. New npm version.
Some early tests.
Adding tets scripts, cos otherwise tests won't run.
Expose any Expires header.
Add the test files.
Enforce camelCase or UPPER_CASE for all variable names
Use the imperative mood in comments, 'Prohibit' instead of 'Prohibits'
Remove references to third-person 'you', it sounds weird
Increment minor version to include 'camelcase' settings and comment updates
Merge pull request #11 from airbnb/sublime-linter-updates

SublimeLinter updates
sshd_config should be a template so we can for realzzz configure it
CMake: Now shared linking option added "LINK_SHARED" (OFF by default)
fix at least some of the issues with beta5 changes
Merge pull request #2 from rhysr/master

Tracking ZF2 changes
Small readme changes
Merge branch 'master' of https://github.com/alathon/Alaparser
add <iostream> into pch for now
CoffeeBreak lesson 3
Fix
CoffeeBreak lesson 4
Nationalities and languages table
qibuild version 1.12.4

Change-Id: I47141bba6cfc579b5e68bf3f26e787f03986fbec
Added Isolated Storage files for storing current city data
Added Date Selection
Enhanced stability
Removed transformatin classes
Reduced Code
Added Date Selection
Added Date Selection

Several Enhancements
jQuery Roundup: 1.7.2, Filtrify, JsBehaviour, Rest Test Test
Hair forgot spaces
Nuspec modification
Adding build changes for Sql Server NuGet Package
Boulay
Don't require webmock by default.

Otherwise it's active in development mode.
Avoid deprecated rspec stub! methods

It's now just stub
Rename PagesController to FeedbackController
Switch to using hyphens instead of pipes in page titles

There is a concern about accessibility when using pipes ("|") in page
titles as screen readers will read a title as "{page title}, vertical
line, GOV.UK".  The suggested fix is to move to using hyphens ("-")
instead.
Merge pull request #46 from alphagov/tidy-page-titles

Switch to using hyphens instead of pipes in page titles
Remove search format filter

@jamesweiner informs me that this is no longer needed. Removing it allows us
to strip out a bit more code. Hurrah.
add order confirmation page
Added synonyms for Welsh

Workaround so Welsh page is returned for 'welsh' and 'wales'
Don't redirect back for authentication, bounce to home instead
new file:   Week1/.DS_Store
	new file:   Week1/index.html
	new file:   Week1/static/.DS_Store
	new file:   Week1/static/js/libs/less.js
turn on auto-indent
Load shows completed todos
Fixed bug where new todos werent displayed in main list
Persisting changes made on main screen.
API Key retrieval method changed
-Modification de la BDD
-Ajout de données
primer commit
commit de prueba
print out path after domain

if you have subfolders instead of subdomains all domains are the same
with the path you can find the propper blog in the list
specify temp and backup database, disable backup

some configurations dont allow to create databases while run time
in this case you can create them (one temprary, one for backup)
and specify this in the options
you could now also disable database backup totaly

Conflicts:

	deploymintClass.php
	js/deploymint.js
	myOptions.php
fix temp db + import data
Fixed issues with the reload projects ajax method not returning blogs
Fixed errors with when attempting to deploy but didn't specify a backup database
Merge branch 'merge-geniknm-master'
username and password are prompted before doing xmlrpc
always generate a view after a file is created
Added visualization nodes
ContainerCascade handles any number of elements
Set up for Swing graph creation. Next: Calculation.
Single nodes use base graph classes
Trees rely on calculator for their width
Restructured object all around node..hierarchicalgraph..visualizedgraph
Removing duplication around Combos to better understand #152
@Overrides
Less dead code
CharmInfoStringBuilder caches tooltip Strings.
This takes the blame from #152 of the renderer and puts it elsewhere:
Instead of 50%, the tooltip now takes up only 3% of time.
By public acclaim: Button and bar below text field.
Deletion does nothing if no characters exist
RepositoryBackup does nothing if nothing to export
Also cleans up stream handling for Import/export
Added a hacky solution that explicitly includes the url helpers, but still needs investigation to find out the real cause of it.
Mudanca da home para a tela de calendario
Header da agenda, botoes de navegacão
Correcoes de Navegação
Cabecalho do calendario
validação do formulário e interação com ajax
fail header
Add Mercurial config files
Fix Python paths, add npm bin directory to path
Slider descriptions

Added descriptions and information to portfolio slider.
+ add aiImporterDesc API to hold importer meta information.
- cleanup some Importer APIs: FindLoader -> GetImporter, add some utility APIs. Note that this is a breaking API change.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1232 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
# Remove Experimental flag from blender loader.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1233 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1234 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
Patch [3520194] Fix compiler warning for non-virtual destructor by Andy Maloney.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1235 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
# bugfix Importer::GetImporterIndex

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1236 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
- make BaseImporter::GetExtensionList more robust, improve error checking.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1237 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
- update unit tests.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1238 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
Patch [3520366] Docs: Spelling and grammar fixes for postprocess.h by Andy Maloney.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1239 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
- rename assert.h to ai_assert.h. See also https://sourceforge.net/tracker/?func=detail&atid=1067632&aid=3520178&group_id=226462

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1240 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
- consistent use of ai_assert instead of assert.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1241 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
Update Xcode Project ([3520119] by Andy Maloney)

This patch updates the Xcode project from git 93c3723da5b43403422bf2ea0d709d6ebb06f143.

It does the following:

- add/remove include files to the project since they moved
- add/remove the OGRE files to the project since they changed
- removes the _GLIBCXX defines since they are no longer used
- sets the compiler to LLVM GCC 4.2
- sets the SDK to Mac OS X 10.5 so it will build on 10.5 and 10.6
- removes the PPC-related VALID_ARCHS

This means it's set up for Mac OS X 10.5 and higher and will build a 32/64-bit universal lib by default.

I didn't touch any Boost-related stuff since I'm not using it, but it should be just a matter of updating the included libs with whatever version you have installed.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1242 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
Removed verts fix, it's wrong
Merge branch 'master' of git://github.com/assimp/assimp
Avoid sending leave messages to incorrect rooms.
Fixed autosave and added water and lava logging
Nuke some error prints.
Merge https://github.com/angavrilov/dfhack
Add documentation for some utility functions implemented in lua.
Add class to check inputs
navigation not worked in Firefox 17

someone check the issue on github
https://github.com/twitter/bootstrap/issues/6352
it's solved the problem.
v0.1.1 uRequire # urequire - case sensitivety issues on linux/macos
Merge branch 'master' into dev

Conflicts:
	source/examples/abc/b/c/d/d-lib.coffee
class Dependency - started modifications
trivial makeNodeRequire change
trivial makeNodeRequire change
(cherry-picked from 92886c1)
Dependency working - resolveDependencies refactored/gone
v0.1.4 - Dependency & NodeRequirer classes working - resolveDependencies & makeNodeRequire refactored/gone
mergin 'dev0.1.4' into 'master0.1.3'

Conflicts:
	source/code/makeNodeRequire.coffee
remove view with wrong name
testing github push without password
updating dependencies
testing
testing
testing
fixing procfile
adding vendor to gitignore
create model restaurante
add validacao restaurante
generate model cliente
add validacao cliente
generate model prato
add validacao prato
generate model receita
add validacao receita
.neobundle を読み込み忘れて vim プラグインがロード出来てなかったので vimrc を修正。
add a script to compare formulas for a definite integral using scipy vs. mpmath special function libraries
add a couple more web scripts to reproduce figures from the paper that looks at fixation probabilities given selection and dominance and allele frequency
New (untested) algorithm for fast length-sorted results in certain dictionaries
Merge branch 'master' into develop
case 1162 - Rating improvements.
case 1162 - Ajaxified data fetching for reviews and tags fields.
Merge branch 'case-1162' into develop
case 1162 - Some additional checks.
Merge branch 'case-1162' into develop
Merge branch 'develop'
modified vimrc "fdm=indent"
adding Legit
Fix compile errors and warnings reported by ICC
2012-09-2901
fix node sidebar
add node_about
Show ido results vertically
Sort ido file list by modification date
Actually enable ido-ubiquitous
Launch browser on bubble click - set up
Allowing versionless modules.
ui: redraw butlove-button & podpress-widget
ui_template:render_help/2: widgets link static bitlove-button.png
ui_template:render_help/2: simplify sample widget usage
Use update() and clear() to make setup/teardown functions more concise
manage whitespace better in the main code template
reorganize into backends rather than having this huge nodes.py file that contains all of the backend logic. Many things are working but many things aren't working (sort, reduce being some of them)
raise a compiler exception when a symbol can't be found
fix template syntax error
update experiments to new-style chestnut ArrayElements
make sure kernels have finished before we exit
remove outdated todo
check CUDA errors automatically in chestnut programs
add more detailed experiments
add python/pycuda backend stubs
add misc examples that were never finished
add debugging side by side tool
update gitignore
Merge branch 'backend-rewrite'
Preserve library source attachments to libraries within the 'Bnd Bundle Classpath'

The current implementation stores source attachment data (if there is any) for each library exposed via the BndClasspathContainer. The attachment paths are persisted to a properties file per project within the plugin storage location.
Support eclipse style source bundles.

When setting up the bnd classpath support attached <bsn>.source bundles.

This "automatic" attaching of associated sources is done if there is not already a attached source path set, and there is an corresponding source bundle that has the bundle symbolic name of <bsn>.source at the exact version of the bundle in question in any of the bnd workspace repositories.
Correct several bugs.

- Ensure the source locations are updated in all places where the classpath is set.
- Ensure that an IPath is not assumed to be the path to a file in disk, attempt to get from the workspace first.
Simply user email case handling
Finish user signup
Add SSL in production
added methods to get private snipts
Added code to create fetches Snipts from Snipt.net
* Move LiveScript to devdep
* Add --polling flag; fix #7
fix for multiple sites
Fixed blank map issue

Caused other problems, can't pass parameters very well.
Make tests slightly more informative
.gitignore: add results/* dir

On server instalations based on a git repo, a simple

Will take a long time due to results, so ignore it.

Signed-off-by: Cleber Rosa <crosa@redhat.com>
Improve virsh_cmd() to support logging output control.

Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>

This patch introduces a new parameter print_info with default
value False to support logging output control.
Add virsh_freecell function in libvirt_vm.py

Signed-off-by: Gu Yanhua <guyanhua-fnst@cn.fujitsu.com>
Add virsh_freecell.py to test virsh_freecell command

Signed-off-by: Gu Yanhua <guyanhua-fnst@cn.fujitsu.com>
Add configuration for "virsh freecell"

Signed-off-by: Chris Evich <cevich@redhat.com>
Signed-off-by: Gu Yanhua <guyanhua-fnst@cn.fujitsu.com>