labofsahil/github-event-dataset-2012 huggingface dataset:
Merge branch 'typo_fix' into develop
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Allow permissive access to the cached root key.
Coupled with permissive access to the pki directory this
should allow non-priviledged users to call salt without
sudo.  This is useful for headless users using the api
and for a small handful of situations where using sudo
is undesidered.
Merge remote branch 'upstream/develop' into develop
Merge remote branch 'upstream/develop' into develop
Parsers(master, minion, syndic) cleanup code.

Moved the minion, master and syndic parsers to use mixins to clean up, reuse, and automate some of the required procedures.
Remove extra kwargs to setup_config.
Cleanup the `salt`(`salt.cli.SaltCMD`) binary parser.

* Created 2 mix-ins as option groups, the output options and the target options. This will allow adding some explanatory text besides separating these options from the parser's main options.
* All options on the parser, including the grouped options are now merged to the loaded configuration which will latter get passed on.
* Also created the timeout mix-in which will be used in other binaries.
Cleanup the `salt-cp`(`salt.cli.SaltCP`) binary parser.

For this, the timeout mix-in and both the target and output parser group mix-ins were re-used. Way less code and logic to keep track of.
Added a simple test for this binary too.
Cleanup the `salt-key`(`salt.cli.SaltKey`) binary parser.

Reused the output options and logging setup mix-ins.

Fixed a bug introduced in previous commit on `salt.utils.parsers.SaltCPOptionParser._mixin_after_parsed()`, function does not accept any arguments.
Cleanup the `salt-call`(`salt.cli.SaltCall`) binary parser.

Reused the logging and output mix-ins.
Cleanup the `salt-run`(`salt.cli.SaltRun`) binary parser.

Reused the timeout mix-in. All cli tools parsers also reuse the config mixin.
This commit finishes cleaning up the cli tool parsers.
Clean up conflicing pillar data in the docs
Fix some left over code.
Fixed sync and reload of custom modules bundled in packages
Merge pull request #1769 from amuraru/develop

Fixed sync and reload of custom modules bundled in packages
Terminado diferencia de medias. Interfaces de Estimacion actualizadas a la interfaz comun
Merge branch 'master' of github.com:sedinson/Web.git
fix property set
made refactoring of cwt/list
removed DList struct (replaced by cwt/list)
alias additions
Fix spelling

typo on line 33
viewport now uses sep vars for tracking screen offset
Extract _handle_V_command_and_X_command.
Fixed a bug for background and border. Try out sample10.rb.
modify twitter consumer-key, secret
modify .gitignore
ajout structure sql
hide db connect params
Merge branch 'master' of github.com:shot056/Anax

Conflicts:
	anax.production.conf
ueberfluessige zeile entfernt
migration imports table schema from schema instance
Added some test, fixed some bugs
added more schema migration tests and fixes some bugs
add bépo keyboard layout

* changes to src/juggler.vim and src/lusty/juggler.rb like
dvorjak/colemak
* make to build plugin/lusty-juggler.vim
added azerty mapping
"make" to generate azerty mapping
remove "a" from cancel_touches in azerty mapping
rebuild
Do not continue if bbdb records cannot be parsed

During a sync it causes problems if we try to ignore bbdb record
parse errors. This is particularly dangerous with the contact
delete syncing, as the records that could not be parsed are treated
as deletions and removed from the remote end.
added CS/Java
Merge branch 'master' of https://github.com/ncannasse/hxWiki
added haxe.Md5 to Forum.hx forum_post.mtt context.
firts step
added tuple header for cross platform compatibility
now using glVertexAttribIPointer for int attributes in Attribute.cpp
- Added simple configuration file parser <Key, Value>
- 3 config files for triangle node topology added
- node now loads data from config files
- added simple, but powerful logger in config/log.h

NOTE: it does compile and connects, but not send anything yet
      (sending is implemented, but not yet fully tested)
finished adding dire bat
Added error catching to grammar
check for non-Mul old in Add._eval_subs
update for nextgen gallery 1.9.6
Librería para manejar jQuery
Add source repository to cabal file
Add basic test for capture
Reset create.js.erb in grocery_list_object
TpDoor 1.1
Refactor empty input values behaviour.

According to specs item should be deleted not restored.
Cleanups, since restoring is not needed anymore.
Refactor tests according to specs.
Настройки для проекта
lxc-ls: Use readlink on $directory

lxc-ls was failing in cases where $directory is a symlink to another
directory. Instead have $directory be generated from the output of
readlink -f "$lxc_path".

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
arrumada ordenacao dos coordenadores
renamed solver header file
extracted universal and pairwise classifier
solver refactoring
added instantiation of the pairwise solver
added calculation of the number of SVs in the pairwise classifier
added possibility of the kernel evaluation for shuffled support vectors
remove .gitignore composer.phar
rename table header 'name' to 'file'
Optimize mybatis with spring
main.py
Added print_line function
MDL-35862 setting gradeitem idnumbers fix
Added reading view
Merge branch 'master' of github.com:tatetian/fm2
41: Maked list items for banks and objects some height, Styled bank items
Removed duplicated banks original images (fixed app.json)
First attempt
Major update
lcu
Merge branch 'a1'
example_person.lua: add a phone number

This illustrates 'enum' and 'repeated'.
Fix: change variable to local as it should be.
Merge pull request #4 from catwell/master

example_person.lua: add a phone number
Add ParsePartial().  Make Parse() check for required fields.

Parse() method now returns an error if the message is missing any
required fields.
Merge remote-tracking branch 'neo/master'
- Move weekdays stuff to demo/
# To run, use node tools/node.js demo.Weekdays
Added easymotion and snipmate
merged
cucumber tests for graph filtering pass
Merge branch 'master' of https://github.com/timko/FreEdu
added in MVC4
Merge pull request #1 from timsong/MVC4

added in MVC4
working parse-save-update db
fixed parsting test, get_page now returns (url, html) tuple
Arlon Paris ;-)
Merge branch 'master' of github.com:topox/routes
Make the conditions more clear.
Route output to CSV is no longer necessary.
Implement track preference.

When the train is on MAIN_0, it means there are no simultaneous tracks.
When a train is on MAIN_1 or MAIN_2, we decide the preferred one by
train direction. Non-main tracks are unpreferred by default.
Implement track preference.

When the train is on MAIN_0, it means there are no simultaneous tracks.
When a train is on MAIN_1 or MAIN_2, we decide the preferred one by
train direction. Non-main tracks are unpreferred by default.
debian /etc/network/interfaces integration for routes, tuntap, and vpn
added auto naming of the axis
undid the strip (slowed it down)
modified:   etc/shiloh/audio-sleep.conf
solution permutating now also uses moving one customer to another route
opts contain all configurable params
tests with actual assertions, multiple property value support
added detailed message for error #015.
Moving example files to test dir
Experimental float usage in color
Properly implemented floating point colors
[HBASE-7099] Make a simpler interface used just for compact hooks in addition to the KeyValueAggregator

Author: adela

Summary: Simpler interface which should be used just for transforming values in KVs. The possible options for a KV would be to be skipped, transform the value, or leave the value untouched.

Test Plan: unit test

Reviewers: kannan, kranganathan, aaiyer, liyintang

Reviewed By: liyintang

CC: hbase-eng@, erling, liujiakai, jfan, ajaysomani

Differential Revision: https://phabricator.fb.com/D611834

Task ID: 1838741, 1749101

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.89-fb@1406268 13f79535-47bb-0310-9956-ffa450edef68
demo includes styling from SGA site
Merge pull request #9 from jgsmith/master

Incorporates SGA look into shared canvas demo
minor formatting change
Merge remote-tracking branch 'upstream/master'
fixed printing to stderr. display a simple error message if vte isn't found, we're running crussh from the command line anyways.
Merge pull request #9 from guppy/master

Minor fixes
dasd
test2
new
new2
Weighted average fixes and start of use + mute players which aren't active for 5 secs.
Now the GPU stuff actually works.
Merge branch 'hpc-trunk-essex' of github.com:usc-isi/nova into hpc-trunk-essex
This file was also modified in the new scheduler
fix movie and change load-callback
Merge branch 'master' of github.com:uxebu/bonsai
Azure integration
canTake & canMove fixed
Corrected year.. have to use current datetime here, maybe
Add tty
very basic thumbnail creation from image uploads
Updated tex/latex

  * tex/latex/isuth-modules/org.dcf: removed a black line boefore
    meta-comment;
  * tex/latex/isuth-modules/org-preview.dcf: new file, it is used to
    preview LaTeX embeddings in Org buffer.

Signed-off-by: Vladimir Lomov <lomov.vl@gmail.com>
incomplete work on adding expressions for annotations
Rendering and fetching first feed.

Separated JS in modules to easily add new feed managers.
Finished Renderer.
Finished HN Feed fetcher.
tagFeed supports sending tags, hnFeed does not read them yet.
Missing Tag loader.
0.0.8 TTF support (sperimental)
Cleanup for iTerm
Add dir.exists function
Remove compiled code after running test
Re-roxygenize
Update NEWS
Added converter for underscore templates

Added -c underscore option
more fix on loading
Commented out the superfluous Save function to avoid confusion
Annotation of internal resource test case passes
light finder is working, must find a smarter way to locate light
Adding complexElements test artifacts


git-svn-id: https://svn.wso2.org/repos/wso2/trunk/commons@132186 a5903396-d722-0410-b921-86c7d4935375
git-svn-id: https://svn.wso2.org/repos/wso2/trunk/commons@136009 a5903396-d722-0410-b921-86c7d4935375
Shuffle a few aliases around, add colors for grep
Tinker with the ZSH config file
Prefer the menu interface for completions
Add a couple of ZSH functions
pylint made happier
Fixes some memory leaks

Also, the function now loops over all parents traying to find
a device that can be ejected.
Fixing listener state machine for disconnect rx

The disconnect should be triggered on the RX command, not the response
like the connect
Change HMTL code for initial testing and added proper formatting to .js file.
More configuration examples.
HDDTemp plugin
Bugfix of HHDTemp plugin
sd: Add power pin, get reset sequence working

We now have a power pin that controls a FET.  This pin should be
exported as a GPIO, and pulled low in order to turn the SD card on.
This patch adds this pin, and does the right thing when it comes to
resetting the card.
main: Use new power pin, parse CID properly

This patch passes the new power pin to the SD init function.

Additionally, we now properly parse the CID that gets returned.  We
do this by stripping away the UNSTUFF_BITS macro that we previously
stole from the Linux kernel, and manually unpacking the bits ourselves.

Granted this won't work so well on systems that are byteswapped, but
it should serve for the time being.
add turn states

using states allow the player to take the cards one by one instead of a
loop that make them diseapear in one frame.

main_game and play modules are regrouped into one until another
decomposition.
move dice rolling logic into model
move shadow and light logic into model
Merge pull request #9 from ynezz/upstream

VS2005 build related fixes
core/MediaPlayer: add openOnly method and resume, stateChanged slots

I'm adding openOnly() method, which just do what it's described, opens the
media file only, because open() currently opens the media and starts the
playback immediately.

That resume() slot is logical addition to the pause() slot.

I'm adding stateChanged() slot, which informs about general player state changes
and it's used mainly in QML player component.

Signed-off-by: Petr Stetiar <ynezz@true.cz>
core/Audio: Fix volume() method returning always -1

Signed-off-by: Petr Stetiar <ynezz@true.cz>
Fixed some mutex problems, added conversation display
send 404 header for 404 endpoint
better 404 header - uses the same HTTP version as the request
better pretty_print_r() function - now takes a prefix and suffix
urls.php now matches URLs with GET query strings at their end
items() endpoint now differentiates between GET and POST requests, and returns a 405 HTTP error if another request method is used.
slightly better engrish ;-)
woops, needed a question mark in the GET parameters regexp
added support for OPTIONS HTTP method, and clarified the OPTIONS/405 textual response
added GET, POST, PUT and DELETE handling for the item() endpoint - starting to think I should abstract this into a common routing function
Fishing out parameters out of the REQUEST_URI
ignoring DS_Store files
add a little scratch space to speed it up 50%
Fix wrong function export resulted after refactor
增加了新闻公告模块，使用列表框显示新闻，点击后显示新闻详情
修改了校园新闻栏目，动态加载后台json数据作为数据源（rss2.0格式），添加下拉刷新和查看更多功能。
增加了校园公告栏目。
Script-based implementation of key publishing
Changing to sha256. Removing slice creation
Correcting key locator. Allowing self-certification
change default CompNum 4 true model
do not plot points in pf
update weight after mu and lambda
fix possible misuse of SingleParticle::new_weight
compute bayes factor
added OAuth-0.23.02
hover over text modifications
updated pole frequencies
Now it takes 126s.
JavaScript code for PE problem 169 added.
JavaScript code for PE problem 265 added.
Merge pull request #5 from 123jimin/HEAD

Head
Merge pull request #2 from 2xyo/master

Merci pour la contribution. Testé aussi sous Ubuntu 11.10 :)
Add Geany and Sublime configuration
Update .bashrc
Change aliases
Add ~/bin to PATH
Cleaning aliases
change to new xquery
Updated ignore list to ignore "Logs" and "Preferences".
push a version by heaton
Merge pull request #3 from cplchina/heaton

push a version by heaton
add private token
Added Helper::$settings
Added ConfigReaderInterface::dump() and made all readers' dump() method support 'Plugin.keyname' format for keys. Closes #3363
Added ImportError to exceptions caught in case QgsMessageLog is unavailable. Otherwise, this failed on my home installation using QGIS 1.7.4. See issue #296
Made sure test can run independently
Moved numerics to common area. Issue #134
Merge branch 'master' of github.com:AIFDR/inasafe
Remove all deprecated enum members.
unecessary comments removed
removed more comments
parse configure file, half ok
Fifth Draft. Added two more complete puzzles. Fixed typo
Change template for the admin part, take the forms out of the python code and into the template
ARELLE-204, look in role type definition for generic label in viewed
language before taking role type definition (or role URI) for
rendering in views (to GUI or file) (except for table LB which
uses label on tabel resource)
Adden new file DjangoWSGI
Fixed the unit-tests to build with wx2.8 Unicode
wait ten seconds before reconnecting
ping yourself every hour, prevent openshift from going idle
Fix typo in readme.txt
Merge pull request #54 from joshbetz/patch-typo-1

Stop dancing the "Can-can" in readme.txt. s/can can/can. props @joshbetz. Fixes #47
Added License and updated version number
updated the call to write_volume_generic
Updated to use LIBMINC instead of MINC
Merge branch 'master' of git://github.com/BIC-MNI/BEaST
second commit in clone repo
[FIX] Commands, XQuery: adopt filename when importing remote URLs
Merge branch 'master' of github.com:BaseXdb/basex
[FIX] XQuery, GH-605: partially fixed for static input
[FIX] XQuery, avoid OOM for large filtered sequences, e.g.:
      (1 to 100000000)[last()-1]
The way works was defined was giving errors in some cases.
This is closer to the original from which I changed it, but I think
it fixes the error in the original.
Updated version to 1.2.4-R1.0 for release.
Cooking interfaces
Version bump, fixed missing include
removing unnecessary pdf mime type
Fix: CSS order
Smartphone View: Position Fix of Headers
Common Error for Smartphone regist
Stop smartphone regist when OPENPNE_REGIST_FROM_KTAI
public_invite for Smart phone ktai_address
Add Flow of ktai_address regist by Smart phone
Regist ktai_address for Smart phone SLAVEPNE login
tp 5
Variable interface handles more corner cases that caused crashes
updated gitconfig to use git-credential-winstore.exe
adding git-credential-winstore.exe
updated gitconfig to use git-credential-winstore.exe
Make single precision default
Moved dec/init statements of loop variables to the loop headers.
Inserted a comment header
Inserted a comment header.
Inserted a comment in the code.
Inserted a comment in the code.
Change download image slightly
Add basic plugin system

Includes download and canvas plugin files (js, stylesheets, images).

The canvas plugin is still a work in progress.
Change quote type.
Prepare ImVirt Portable.
Return VMD list sorted case insensitive.
Add ImVirt Portable stuff.
Update README.
Update README.
Remove link.
Update ChangeLog.
Merge pull request #6 from liske/master

Merge ImVirt Portable stuff.
Harvesting configurations added
Merge pull request #150 from lyncode/DS-1415

DS-1415: Harvesting configurations added [master]
Changes again
Merge branch 'gh-pages' of github.com:DaBs/Facelift into gh-pages
add web_pr
Fix arg parsing in line and prism.
add model collection function, to retrieve an array of models. also add a bunch of examples (not all fully tested)
add some clearer error checking for an unknown error. to be looked into soon
MOTHERHSHIP: Added page to view and remove scheduled events

Shows the event, the events parameters, and provides a button
to remove the event from rotation. Needs testing, just doing a quick
commit
QUASAR: Work on making the look of the configuration summary page better

Configuration Summary is set to look a little better organized, as well
as some little graphical things being fixed.

Issue #6

Signed-off-by: awaldow <a.wal.bear@gmail.com>
initial test for multicursor mode

Ctrl+Alt+Click add a new cursor
when in multi edit mode arrow key will end the mode
more or less professional information
Merge branch 'master' of git@github.com:Dexels/navajo.git
Merge branch 'master' of git@github.com:Dexels/navajo.git
Release of com.dexels.navajo.api version 1.0.4
Development stream of com.dexels.navajo.api version 1.0.4
Release of com.dexels.navajo.rhino.continuations version 1.0.6
Development stream of com.dexels.navajo.rhino.continuations version 1.0.7
[ticket/10675]
Add language string visible by admins only for when the disk does not have
enough free space when uploading attachments.
Finished Episode 28 of the tutorials.

Created a renderTile method in the Screen class.
Properly set CC=clang and MAKE_ENV gets overwritten.
Fix path to library for sandbox directory.
Ensure the correct lib_pypy gets picked up during translation.
Fix anchors with fixed header
updated docs to recent changes
add ReconOS tutorial
Added the VerticalDock option.
Removed unactual urls from BBCode condition
Version 2.3.1
Removed django-openid (will be django-social-auth in future) from *.py files
Removed django-openid (will be django-social-auth in future) from *.html, *.txt files
Fixed bugs
Two travis-ci pngs for two branches.
Added support for handling a pong, and keeping track of the last time we recieved a pong for each server
Merge pull request #12 from FOSSRIT/handle_pong

Handle pong
moved the last_pongs dict to where it should be initiliazed
Added method stubs for join and message commands
Merge branch 'develop'
includes readme updates and more protocol method stubs
Removing remnants of iwebkit on joomla3 branch
Merge pull request #198 from trob/german

German lang. files + typos
*) Make install() definition similar with order package modules
*) Handle refresh param in install()
*) Fix upgrade(): freebsd-update does'nt care about packages, it's about OS itself. But there is not easy way to upgrade package with old package system.
*) Fix docstring example in search()
*) Bring the changes above to the man page
Merge pull request #2045 from giantlock/develop

Some fixes for freebsdpkg module
Merge branch 'upstream/develop' into windows_multiprocessing
[cosmetics] - whitespaces
[dvdplayer] - implement RegisterAudioCallback and UnRegisterAudioCallback in dvdplayer - this fixes viz when playing audio with dvdplayer - fixes #13249
Merge pull request #1292 from Memphiz/dvdplayeraudiocallback

fix viz with dvdplayer - add audiocallbacks...
Revert "[droid] fix crash in network properties"

This reverts commit 398710e770993ed993b1932818e03ee2db6035df.
[droid] proper nameserver detection

Should fix high cpu usage and crashes in certain system dialogs.
[AE/CA] - on initialization of the audiograph set the initial volume (else we would endup with 100% on reinit)
removed the fatalerrorhandler and exit gracefully
[WIN32] fixed: special chars in DVD/CD names weren't correct
Bypass OpenDefaultStreams when reading DVDs. This fixes an issue where incorrect stream IDs were opened thru the demuxer instead of following what the DVDNavigator dictates.
Merge pull request #1166 from Voyager-xbmc/fix-dvdplayer-streamids

Disable OpenDefaultStreams in case of CDVDInputStreamNavigator

The navigator will dictate when streams are to be open, during playback.
[nfs] - don't close invalid handles when openforoverwrite fails
[droid] fixed cpu usage got NaN when no cpu stats changed. display zero instead NaN.
Merge pull request #1297 from huceke/master

[droid] fixed cpu usage got NaN when no cpu stats changed
fixed: enable lowfps mode for minimized windows in X11

if not, render loop spins at full throttle since vsync is skipped.
thanks to davilla for hints
get all the nameservers not only the first one
[osx] - fix "Shades" - app lets the xbmc framerate limiter kicking in - muuuh
[linux/input] fixed only accept known hid device types in linux input layer and one additional sanity check

There was one case on a linux embeded device where an uncommon hid device started from time to time input events. To prevent us from uncontrolled unknown devices only accept input from kown device types. Discussed with davilla on IRC.
Merge pull request #1299 from otzy007/dns

[LINUX] Get all the nameservers not only the first one
Merge pull request #1294 from wsoltys/removefatalerrorhandler

removed the fatalerrorhandler and exit gracefully
fix Linux build after 6c806122d19bf7b2dfcb41c6aefbf64fe5767ef5
We are now licensed under the BSD license.
Mods folder is now created if it doesn't exist
Refactored items somewhat.
Add find_old_branch level
added find_old_branch level
first responsive web design demo
Interfaz Dialogo Share
View Group dialog terminado
Integrado con Settings
Allow non-gui UF options to be edited in lua.
6.0.2
Move threat meter based on target height.
local-variables command. :neckbeard:
Use `ls -l` instead of new command.
Eliminate spurious hashrockets.

These were coming from a pretty simple source: the DEFAULT_PRINT
prepends them so you can get output like:

[1] pry(main)> 2+3
=> 5

But since we're formatting these differently, obviously we don't want
that prefix. So this patch extracts a Pry.format_for_output method then
calls that iff the user hasn't changed the default.

There is some hackitude involved, but the test pass (and are of decent
coverage, I think, so feel fry to try to diff this down if you have a
good idea.)
Non-MRI1.9 local_variables return Strings (dumb.)
Not !~, but .not =~.
Rename to output_with_default_format
Merge github.com:Havenwood/pry
Die politely when $SAFE > 0 [Fixes #744]
Pry::TooSafeException for 1.8.7 support
Merge remote-tracking branch 'rking/feature/ls-l'
Move hashrocket out of Pry.config.print

This simplifies the contract of Pry.config.print which makes it easier to use
in other places that we want to output a value, like ls -l.

If desired you can stil remove the => by setting Pry.config.output_prefix = ''
in your ~/.pryrc
Completion for show-source/show-doc/?/$ Array#<tab>
Support $ <object>::<method> [Fixes #719]
Add Pry.critical_section to break pry inside pry [Fixes #729]
Add gem-open to open the gem in an editor
Factor out logic for finding gemspec
Add completion for gem-open and gem-cd
Add a space when completing command names and long options
force precedence of modules over methods when using C::X syntax
Rename for tabcompletion-friendliness.
html layout
merge
Merge pull request #8 from mami602/master

html layout 追加
fb connect v1.0 done.

- connect with fb account
- link fb account with hc acc.
枚举属性值时丢弃空串，告警内容的字段宽度设成255，处理协议参数为空({})的情况
Fixing the bug with detecting captured points.
Added .gitignore and .gitattributes

Just because.
Updated italian translations.

Added new strings and translated them. :)
Sorry for late. :/
Clarify ajax-engine.coffee
Fixed other mistakes.
Arranged truncation
Arranged truncation
Re-adding simple docs
add:settings file
converted documentation to slurp its samples from actual compiled and tested source files
Update routes/index.js

Hey Toschi, hab da ein paar kleene Vorschläge bez. Performance
Respect case in autocomplete
Update README.md

Testing a change from the fork.
Merge pull request #1 from jengoree/master

Please merge my changes.
update JDOMUtil (from IDEA); replace StringEscapeUtils -> mps.util.StringUtil; tests
move j.m.build.mps.runtime solution to plugins/mpsbuild directory
test
add helper method in MpsLoadTask
fix some paths in MPSLoadTask
mps.gen.module.xml ant task
fix dependency
re-generate
paths in MPSLoadTask
read action
move test to sandbox
restore ant.xml
mps.gen.module.xml ant task - allow inner xml
change attribute dest to destfile accoriding to ant task design guidlines
Allow to set classpath in anttask
minor changes in sandbox
Merge remote-tracking branch 'remotes/origin/master' into buildlanguage

Conflicts:
	MPS.mpr
	core/ant/models/ant.mps
	languages/build/solutions/models/jetbrains/mps/build/mps/runtime/anttask.mps
	plugins/mpsbuild/languages/solutions/jetbrains.mps.build.mps.runtime/runtime.msd
generate after merge
Merge remote-tracking branch 'remotes/origin/master' into buildlanguage
Merge remote-tracking branch 'remotes/origin/master' into buildlanguage
Merge remote-tracking branch 'origin/master' into buildlanguage
GenStress less processes
V0.3
Merge branch 'master' of https://github.com/Joepeman/CoLa.git
First steps towards task specific operation
Utility to delete a given field from all pages
Limit number of multi-user reservations of a page to 3
No longer need Config->Binary_Dir we can use the global variable, update docs
renamed games
Reader: fixed issue when more Gcal events requested than returned.
Additional changes 2bfce843fe441a376c71976a126b4d8fd70f4b53
Add JavaScript Good Parts
use the find_* functions ENV parameter

Instead of directly passing $ENV{SOMEVAR} to a find_* call pass in ENV SOMEVAR.
This will make sure the paths will get correctly handled through different
platforms, especially on Windows.

Also fixes one place where paths with windows delimiters (\) were hardcoded to
use forward slashes.
use PATH_SUFFIXES to simplify find_* calls

Especially remove "lib64" when the given paths are all Unix ones and "lib" is
also explicitely given. In that case CMake will search "lib64" anyway for
platforms where it is known to make sense.
Merge topic 'lib64-cleanup' into next

cfe4ac4 use PATH_SUFFIXES to simplify find_* calls
b04650e use the find_* functions ENV parameter
FindX11: remove duplicates from X11 include path list (#13316)

Most if not all X11 includes are typically in the same directory, so this
usually returns a huge list with only very few different entries.
Merge topic 'FindX11-duplicate-includes-13316' into next

97c338b FindX11: remove duplicates from X11 include path list (#13316)
CMake Nightly Date Stamp
Ninja: prepare msvc pdb cleanup
Ninja:split out setting of msvc TARGET_PDB
Ninja: remove GetTargetPDB because it is used only once
Merge topic 'ninja-target-pdb-cleanup' into next

709fa59 Ninja: remove GetTargetPDB because it is used only once
4bb4787 Ninja:split out setting of msvc TARGET_PDB
59cbc28 Ninja: prepare msvc pdb cleanup
c478d55 CMake Nightly Date Stamp
Added in Facebook faces for enemies. Click to login, then click to start game.
gamestate class created and hero/being classes tweaked
Meeting agenda monday lv2
tog bor githjalp
bytt plats på grejer och tatt bort textbaserade-main
FINALLYYYYYYYYYY! After 4 hours of troubleshooting and testing the join and logout function works as they should. Some graphical improvements is still to be done, but damn. That was tough bugs in the hood.
bugfix: releasing with script
Module Base and Thread tests
Небольшое дополнение
Установил защиту от "ламеров". Ну или просто от нежелательного выполнения кода отдельно от файла, к которому они должны подключаться =)
NorthUp prepared for other Map Orientations
AIRSPACE FILTER

Airspace Filter (All below, Auto, Clip) now work in multimap
Fix small bug terrain shading option: changing terrain with shading off would not allow us to enable shading again.
Switching back to lists, consolidating interface
Merge branch 'master' of github.com:LNFY/jschurch
raw_pitch in crop_masked_pixels()
修改了README，描述一下语言特性。
project: Use project-specific compilation scripts
xsession: Fix script sourcing issue
Revert "zsh: Create experimental Powerline-styled prompt"

This reverts commit 04485bf85bb28f8da00ca9dda7cfd0a717ffd907.
FIX: Error en la denuncia de fotos por medallas.
Mostramos posts privados en la portada y se agregan leyendas.
Se mejora la portada de moderación y unos indices erroneos.
FIX: Mostramos consulta cuando se produce un error.
FIX: Problema con consultas con claves compuestas en Model_Dataset
Agregada la notificación de noticias por Ajax.
FIX: Carga de sucesos cuando no se está logueado.
Implementados los CAPTCHAS.
Agregadas páginas estáticas con protocolo, dmca, etc.
Actualizado CHANGELOG
Merge branch 'feature/captcha' into develop
Implementación de emoticones y algunas mejora al parseado BBCode.
FIX: Link de vista preliminar olvidado.
Eliminados archivos inutilizados de Decoda.
FIX: Métodos before y after son opcionales en los controladores.
FIX: Problema de inspección de clases del núcleo para plugins.
FIX: Mensaje de error de catpcha en nuevo post solucionado.
Permitimos agregar clases nuevas al motor mediante plugins.
FIX: Error con el primer inicio de sesión de los usuarios.
FIX: Problema de la instalación limpia del script.
Mjepp.
Merge pull request #7 from Maxfrank/feature1

Mjepp.
Merge remote-tracking branch 'origin/master' into hotfix
modifs des package de la doc.
Modification du générateur de template et ajout du Gestionnaire de vues.
factorization of freqspace1 with colon generator
add forgotten math.hpp.cmake file in arithmetic
updated tests for complex predicates
removing some spurious files
geneig
regression in display adding nt2::
adding invexp_1 to exponential constants
suppressing some global constants includes in trigonometric
gsl_specfun is now a member of the extern modules group
bitwise rot sha roti implied by xop
fix bad includes in rot90
changed hardware driver, 2pi problem
Relative Pose Subscriber Works. Listening to manualShutter doesn't.
Update api used wrong serializer when updating full objects
Merge branch 'master' of https://github.com/Mpdreamz/NEST
Removing buggy JS from login screen and attempting to fix moderator on_save method
Files Added
Basic setup + patient management
Correct broken machinery in Metadata class following datetime changes.
Refs #10067. Fix event dequeing logic issue
Update master
Merge pull request #273 from YondaimeUzumaki/patch-9

YondaimeUzumaki
COMPLETATOOO! :D
Kyuremnero99
Merge pull request #377 from KyuremNero99/patch-10

Kyuremnero99
monitor preparations to contest
Andrew fixed something
Merge branch 'master' of github.com:Neo307/Test01

Conflicts:
	NewFile1.txt
Ajout du fichier de description
Premier test sur le projet: fichier avec une ligne créer un cube un cube
avec une face
Merge remote-tracking branch 'origin/cours_iae' into cours_iae

Conflicts:
	jcube/readme.md
node-packages: add "source-map" and dependencies
node-packages: upgrade mongodb and bson
vlc: use ffmpeg 1.0
logic cleanup
MPlayer: upgrade to 1.1

- big cleanup of optional dependency handling
I hope I didn't miss any cases.

- XVID
xvid support seams broken, both built-in as external.
I didn't notice any issues playing xvid video's though, as ffmpeg's
default mpeg4 decoder handles xvid-encoded files just fine.
It seems the only users affected by this are users who still encode
xvid with mencoder (instead of plain ffmpeg). If this really is an
issue to anyone, please let me know, so I can look into it some more,
or retain an older mplayer version next to this one.
gtkwave: updating to 3.3.39
Added Questables support
Prevent source recipe from running on Windows
Improve Readme

Add Ohai version dependency

Add Windows Dependencies section
Update attributes for git 1.8.0
Add guard since server recipe won't run on Windows
Seperate the tags on patch header
Selenium2 !
Seeing firefox rush through the scenarios is priceless
default to GL core on VideoCore

performance issues were fixed a while ago so this should be a safe default now.
(Android) Some native glue code optimizations
Merge pull request #58 from OV2/master

wgl fix for preferred monitor!=main monitor and width=height=0 in regular fs
(Android) Reimplement native glue code
(RARCH_PERF) Rename benchmark.c to perforance.c
(MSVC2010) Rename incorrectly named MSVC2012 solution which was
really an MSVC 2010 solution
(MSVC 2010) Add solution
(Android) We'll be able to tell now at runtime whether or not
a CPU has specific features (such as NEON, hard float, SSE, etc.).
Will refactor this later and add getters/setters
(PC/Linux) performance_android.c works for PC Linux too - refactor as
performance_linux and compile it in for Linux build (but don't yet use it)
(Linux) Try to log processor features
(OpenSL/Android) Reduce latency by going from 8 to 6 buffers
Revert "(OpenSL/Android) Reduce latency by going from 8 to 6 buffers"

This reverts commit 26d6d18a0295a58f91410dba77dc9331e20991d4.
Purge overkill perf checks.
Add CPU feature detection for X86.
Always compile in performance.c on Win32.
(Android) Performance changes - build fix
(Android) Now detects if CPU has NEON or SSE3
(Android) Rename sse3 to ssse3
(Android) Set -fno-stack-protector
Fix x86_cpuid to preserve ebx for PIC.
(Android) Create input_state for Android app - can now signal that a window
was created, or that we want to shutdown
Update CHANGELOG
Fix #2434 and #2442
Fixed ctnk desync #2448
Fix #2433 - crash when ctnk order generator was active if ctnk dies
Fix #2449 - ctnk line of sight improved
Increasing cost to $2500 as well as reducing armor to 50 hit points.
nerf dtrk speed from 8 to 6
Fix open areas for allies maps
Increase deaths threshold to 200
Barrels were not scorching the terrain
Allies02: Make Allied infantry buildable by the Allies1 player when they capture the Soviet barracks. Remove ctnk from the build menu
First version of Allies 03
Add yak strafing, support for SP as well as MP, additional Soviet spawn point
Improvements to map layout
The Allies 02 Soviet reinforcements at 16 minutes are a bit too insane
Remove evacuee buildings to stop the players building on the other side of the map
Increase duration between spawn for SP
Reduce threshold, unused variables
Rename Evacuees player to Allies. Make AA gun buildable.
Add airbase and airbase secondary objective. Improve Soviet attacks. Enable players to capture sam sites as well as destroy them to complete the objective in Allies 02
Merge pull request #517 from havvg/feature/reset-version-comment

[Versionable] reset version comment upon saving
Fix: allow arrays as behavior parameters to be exported by the tablemap builder
Merge pull request #519 from K-Phoen/fix-tablemap-builder-behaviors

Fix: PHP5TableMapBuilder and behaviors
fix wrong order of result when using withColumn and select(), add tests to prove the issue
Merge pull request #522 from jaugustin/fix-select-withColumn-order

fix wrong order of result when using withColumn and select(),
Used by PR https://github.com/symfony/symfony/pull/6150
changed \PDO to PDO
add test case to test ColumnMap->isInteger() method
fix typos
Merge pull request #526 from woodspire/IsInteger

Add IsInteger function to ColumnMap
Merge branch 'master' into ormigo

* master:
  fix typos
  add test case to test ColumnMap->isInteger() method
  changed \PDO to PDO
  Used by PR https://github.com/symfony/symfony/pull/6150
  fix wrong order of result when using withColumn and select(), add tests to prove the issue
  Fix: allow arrays as behavior parameters to be exported by the tablemap builder
do not load unnecessary data from database
fixed search invnetory item to add relationship
-Combinator
Add CGIModule.h
Merged most of the code (still needs debugging)
simply card system : improvement play time
[211] Fixed a few php strict errors that were popping up.
Fixed header and changed @primaryColour
Added basic grid styling and a bottom border option to the row
Proposal for devstatus.xml schema.
Update gamemode/client/vgui.lua
lra 2010 sqlite
added nerdtree for vundle
add missing sequenceNumber when creating chunk with faked metadata
add parameters for voxel size and index origin
change version number to 0.6.0
astyle -r --suffix=none --formatted --options=design/astylerc *.{c,h}pp
Merge remote-tracking branch 'group/master'
Merge pull request #63 from Rollmops/master

add progress to vista_io plugin
Merge remote-tracking branch 'group/master'
fixed Image::getIndexFromPhysicalCoords for index coordinates which are outside the image bounding box
Example Processing code to plot Arduino data
Merge remote-tracking branch 'origin/slurm-2.3'

Conflicts:
	src/sview/node_info.c
switch/nrt: add network count to poe data structure
added ENG dictionaries for pymorphy and inclusion of settigs_local
added logging to handleException() and checkcast()
added links
precompile staticpages
include staticpages in tree
another precompile
added precompile flag
removed extra stylesheet link
another precompile
Extra Flags
C++ comments to C
Phony targets
Check malloc()
errno.h -> errlist.h
errno.h -> errlist.h
Indentation
Make errors explicit.
strcpy() -> strncpy()
Fix namespace of CHART constant
follow the change of the location of mysql_install_db.
Revert "Run in the foreground when started by GDB."

This reverts commit dc6130fae6f7d66d518568759d281d7ded4c601e.

If you want to debug it's actually more straightforward and logical to add the
arguments you want (-f and potentially -d) via the command line explicitly,
rather than having execfs infer them for you.
Build a binary for debugging by default.

This also enables GDB hooks for debugging.
Strip a non-debug binary.
Remove testing for raised errors - now messages
Update other/upgrade_2-1_mysql.sql
Update other/upgrade_2-1_postgresql.sql
Update other/upgrade_2-1_sqlite.sql
Update other/upgrade_2-1_mysql.sql
Update other/upgrade_2-1_postgresql.sql
Update other/upgrade_2-1_sqlite.sql
Merge pull request #24 from norv/patch-2

Patch 2
Chroot fix
Imlpemented transfer and withdrawal in client and server parts
Added some money to ATM.
test2
test3
test
Merge branch 'master' of github.com:Test29/Test29
improved ios tableview layout
rbx 2.0 is dead since 6mo or so, using rbx1.9 mode to get full green lights from travis.
Updated the web site version of NEWS.txt
Déployement CakePHP
1) Don't try to stop screen process after killing/nukingm if screen isn't running.
2) Don't delete plugin configuration in nuke_and_delete; people won't expect that.
3) Better messaging when killing.
cannonical style of infinite Java loop in Javadoc, new line avoided
add initialization to numberOfTestsPass variable to 0
Add missing import
Merge pull request #2541 from UtahDave/fix_client

Fixes #2540 Add missing import
_error function was missing from file ex module
set worker threads to 1 for testing

Travis CI is failing on python 2.6
Trying to lower total memory consumption so the tests
will pass
Clean up console.py

SINGLE QUOTES
Bare exceptions are bad
vars being used without being assigned
Merge branch 'develop' of github.com:kjkuan/salt into develop
Clean up file state mod
Merge branch 'develop' of github.com:saltstack/salt into develop
update cassandra module to use config.option
iminor fixes for win_network
Fix bugs in mount introcuded by @SEJeff
String and pylint fixes for state module
Add _OS_NAME_MAP entry for Arch Linux

Without an entry for 'arch' in this dict, the pkg module fails to import
for Arch Linux (pacman.py).

Also, I fixed a couple of open filehandles in grains/core.py.
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge pull request #2542 from archtaku/develop

Add _OS_NAME_MAP entry for Arch Linux
Clean up some missing componets in console.py
A few more updates for the cassandra module
remove unused getpass
minor pylint fixes for minion.py
comps was not yet defined
Use lower default inertia for differential driveshaft.
Removed a binary added by mistake
Generate RSpec, add spec for Card model
Add spec for Deck model, add cards controller
Fix broekn TestExportV2Suite catalog update assertion error
ENG-4006: Ensure a counter gets incremented in the face of failure.
Also add less chatter on connection loss.
ENG-3164 recognize materialized view partitioning
Merge pull request #78 from VoltDB/ENG-3164

ENG-3164 recognize materialized view partitioning
ENG-3193 "Option 0" patch -- Avoid wrong answers by disabling use of compound indexes in partial GT scans.
Stop spewing command line for localcluster.
Add a lowest site for host function for IV2

IV2 sites do not appear in the usual site tracker sites lists.
Comply with systeminformation schema

Make IV2ENABLED key return "true", not true.
Enable TestAdminMode.
Add iv2 initiator stats; makes TestAdminMode pass.
Enable SystemInformation test.
DEMO
Merge branch 'master' of https://github.com/Vsh3r/file.js
footer info only for authenticated people
Merge pull request #228 from Arpaso/master

footer changes
added link to each option in a ballot
closes #32
adding pollsites
added connection lost indicator to timerview
made connection lost indicator more obvious
changed javascript-code for better overview
fix elections UI

(disable preview feature, can't be done right with current codebase)
Added Chap 10
Added Chap 12, 13
Quinta importacion
change pref `ftp_method` formtype

CorePack 20121230 より一般設定用の formtype の `radio_br`, `checkbox_br` が廃止になったことのための修正。
X-update version 0.30
Merge branch 'xupdate' into stable
RSS Feed Fixes
- If no author node was referenced, <dc:creator> showed the node creator in the byline in some RSS readers (iPhone).
- Fixed "more", image, and "add new comment" links in RSS for imported content.
fix old name for getting all documents api function
db
scheduler

Changes
 * finegrained deps managing
 * database now is class prop
 * check process statuses to detect deps status
059_use_flag_stuff: fixed typo in dependencies

// хто спішить той людей смішить!
Added new namespace: Portage3

This namespace should hold all modules/classes that were/are/will be created
logger module: full rework

Changes
 * renamed file
 * put in main namespace
 * client API
 * gracefull finish
database module: full rework

Changes
 * put under main namespace
 * added logger client
 * use logger API
 * optional id param for client
couple of updates for tasks.rb

* moved module to the root of lib folder
* added include for scheduller and runner
scheduler module: major rework

Changes
 * move into tasks dir
 * cleanup public API
 * cleanup internal API
 * use logger API
 * use db client API
runner module: major rework

Changes
 * move to tasks dir
 * use logger API
 * use db client API
 * cleaup API
 * use new 'shared_data' API
update of sqlite for single read of ebuild stuff
Use db client API in category module
Use db client API in package module
ebuild modules update: db client API, fixed includes
Batch update of tasks with API stuff

Changes
 * new logger API
 * new logger API for group_log
 * new shared_data API
 * fixed includes
091_ebuilds
added new task - 093_read_ebuilds_data

To prevent lots of IO ops we added a new task task that reads everything
we need from every ebuild and store it into temporary table
new task - 096_ebuild_stuff

'copies' mtime, mauthor and lot of eacj ebuild from temporary table into
ebuilds table
ebuild_keywords: reindex + ebuild one read feature
ebuild_use_flags: reindex + ebuild one read feature
095_ebuild_descriptions: drop useless task after EOR
ebuild_descriptions: reindex + ebuild one read feature
ebuild_descriptions: reindex + ebuild one read feature
Fixed too few conveyers in farmlands
Darkened houses, increased minimap noising
Added GUI windows,
set a new minimap (press tab or mouseMiddle to show/hide),
and random GUI stuff
Figuring out if JRUBY_HOME is being set and looking at installed gems
- sequence comprehension
removed format_number; removed event click on map;
Fix 'I' to go to beginning of line past whitespace

* Add headOfLineWithoutSpaces:
* Refactor CARET to use headOfLineWithoutSpaces:
* Change 'I' to use headOfLineWithoutSpaces:
Hook up '?' to start command mode with '?' as the first letter

The functionality to search backwards was already implemented, this little snippet was just missing to start up command mode with '?'
Reorder some methods to keep them alphabetical
Merge branch 'master' of github.com:JugglerShu/XVim

Conflicts:
	XVim/NSTextView+VimMotion.m

replace wordsBackward with new schemed method
Merge branch 'master' of github.com:JugglerShu/XVim
Fixed the behavior of 'I' when its blank or whitespaces line.
Now haedOfLineWithoutSpaces returns NSNotFound if its empty line(blank
or whitespace only line).
Support Numeric Arg by 'G'
Close #43
handles 'cd' 'dc' correctly.
now 'cc' insert newline after deleting specifled lines as Vim does
Close #44
fixed :NNN command.
It correctly handles wrapped lines. (now it determine the line number by
counting '\n's  and not by moveDown motions)
Close #46,#64
Visual mode supports 'x','X','D'
Fix undo problem with 'J' command.
It uses insertText: to insert space to be dealt with undoManager
Close #52
Fixed 'A' does not work properly when the line is wrapped
Close #35
Fixed the problem that a cursor position goes to invalid
position( on newline character) when moving cursor with mouse click.
This is currently implemented by hooking NSTextView delegate method
"willChangeSelectionFromCharacterRanges:...".
This cause side affect when moving into insert mode by 'A'.
'A' is implemented as moving a cursor to newline and go to insert mode,
but this fix prohibit moving the cursor to newline.
So now 'A' changes the mode first and move a cursor then goes into
insert mode.
We should re-think again how to treat these things.
changed code according PEP8 definitions
with new mini doc inside
Move ToolMethods into Tool
Change the way how SETTINGS is defined in Makefile
cambios gem localizacion
Initial commit
Merge https://github.com/agurk/Lets-Go
more fizes for small buckets. fix test
Item gathering feature
push and responsive changes + docs
Added .nojekyll file so pages are displayed correctly on github pages.
initial hello project
automatic converted version
temporaly initial fixed
fix package
temporaly fixed abstractItem
temporaly fixed AbstractConstraint
fixed abstract particles
fixed mathutil
fix interval
fixed
fixed composite
fixed group
fixed
fixed
fixed
fixed
fixed
fixed
pass initialize
fixed wrong initialize
Each.cons and Each.slice
Testing cssBackgroundSize with retina display.  Defaulting to false for now.

Signed-off-by: Aaron Vanderzwan <akv292@gmail.com>
[#88] (ogl, rr) Added check to ensure the virtualenvs home directory exists before attempting to create a new virtualenv.
[#88] (ogl, rr) Corrected check for virtualenvs home creation so that we create the directory with appropriate user ownership.  Added check for virtualenvs home creation in the rebuild_ci_virtualenv.sh script.
[#88] (ogl, rr) Updated expected pip version to 1.2.1.
Merge branch 'feature/deployment_fixes' of github.com:akvo/akvo-rsr into develop
Added doctest for the iati-id validator

Added a test_runner_nodb
Added doctests for the validator function

. #69
cleaner main()