labofsahil/github-event-dataset-2012 huggingface dataset:
server broadcasts state now
Merge branch 'master' of github.com:deathbob/MAC-PAN
Double the size of the images. 

The size of the images is now double as it was before. 
A problem arises with the upper edge of the image, which displays a grayline over the pic which can not be removed in any obvious way so far. Same thing happened before and happens as well with the right edge of the pic, but these cases were solved by setting a stimulus size a pixel smalled than the actual image. Now this approach does not work. 
Merge branch 'master' of github.com:dedan/poly_burst
Merge branch 'master' of github.com:dedan/poly_burst

Many changes: 
	>> Now the number of bursts (i.e. burst_index range) is determined by the length 
of the decomposition of the target image. It does not make any sense to have 10 
bursts if only 4 polygons are available in the polygon decomposition. 
	>> Before, the polygon to be displayed was determined by burst_index. This is 
not possible any longer since the number of polygons changes from one decomposition 
to another. To solve this: 
		> A dictionary has been added which links the number of a stimulus to the 
polygon of the stimulus that has to be displayed. 
		> The polygon displayed for the target stimulus is still determined by burst_index. 
		> The polygon displayed for non-target stimuli is chosen by random among 
all the polygons of its decomposition. 

	>> Previously, many display issues where solved with burst_index. Now it is 
preferred to used the dictionary described above. Among them: 
		> Load correct polygon decomposition in preparePolyDecomp() (this was 
indeed the reason motivating the introduction of the dictionary). 
		> Feedback after burst which displays the right polygon and the selected 
polygon. This modifies the argument of the functions called with this end. 

	>> on_control_event() is called now as if the result of the classifier were a 
random one among those possible. 

	>> Information about the selected polygon to display is not included in the 
triggers anymore. The info is still sent to debugger and could be included written 
into an external file upon request. 
Changes on TrainingFeedback: 
	>> Modified comment on preparePoly(). 

	>> Information about selected polygons is not attached to the trigger. 
Amends changes on PaintingFeedback made two commits ago: 

	>> Contribution of the selected polygons to the triggers had not been deleted 
yet. 

	>> Function preparePolyDecomp() has been made more compact.
toevoeging drankdetail
added params to XMLValidator.validate method
Sorter from Naming.rebind to Registry.rebind...
Clean up
Clean up
Merge branch 'master' of https://github.com/despairblue/swtp
cleaned up graphic elements

removed last instance of nike as well as place images in correct
locations
play vedio size test
fix
fix 2
Merge branch 'new_branch'
Include options.xul in xpi
update boootstrap
add sort tool
Add Filter Custom Sort
Merge pull request #18 from firefox007/master

Add Filter Custom Sort
l
l
bootstrap
l
l
l
l
adds `switch-to-process' and improves font-locking
fix delivery report chart at district level
csv downloadable tables
print the label in the tpl files instead of in the template.php
[Validator] Updated Romanian translation
First Check-in including updated README, MIT License,
tested application and blueprints, variable routing, middleware
удаляю служебный файл из репозитория
Updated migration generator template.
confirm cosmetics
Merge branch 'master' of git://github.com/dmwkim/MealMates
Removed deprecated function doc

Signed-off-by: Derek Myers <arcticpro@gmail.com>
Added static property to get a zeroed coordinate
Editor v0.2
Nuevo archivo career.html
Add uart function.
Add some comments in uart_init().
Lboot added C programme stack.

There are 64M Sdram, which starting at 0x30000000, ending at
0x34000000; Kernel starts at 0x30008000, Ramdisk starts at
0x30800000.
Lboot's lds script added bss section.
Adjusted include directory.
The code in lboot_uart branch now can be built successfully.
Add uart function.
Add some comments in uart_init().
Adjusted include directory.
The code in lboot_uart branch now can be built successfully.
Merge branch 'lboot_uart' of github.com:dongyulong/lboot into lboot_uart
Fix written bugs.
Merge branch 'lboot_led' into develop
Modify printf function, but still have some mistakes.

print.c:(.text+0xec): undefined reference to `__udivsi3'
print.c:(.text+0x100): undefined reference to `__umodsi3'
Revert "Modify printf function, but still have some mistakes."

This reverts commit 12fbefbcd4bdcf551cf93127314aad8530a294d0.
Modify macroname's definition in reg.h
Lboot add lib diretory.
Uart0 has successfully communicated with the minicom.
Added "_udivsi3" , "_umodsi3" and "printf" lib functions.
Added lboot shell.
Se agregaron funciones y else a los elementos disponibles para agregar.
Se arreglaron problemas con el borrado de elementos y se eliminaron los conectores de salto.
Merge branch 'master' of github.com:donverduras/trex
changed how drive letter is determined

Using a properties file was a bad idea, as the drives had to be assigned
manually. Easy to forget, this would result in pruning a large portion
of the index. Now using entered path to determine drive letter.
/session/:id resource
/update-session, closes #2
Kinetic_network implemented as function. Rao function to deal with trajectories done.
Kinetic_network implemented as function. Rao function to deal with trajectories done.
[refactoring] Remove liten on `SIGINT` event for gracefully shutdown server
v0.13.5
[bug fix] `cli-color` api change
v0.12.4
fix redirect url for table entries deletion
fixed typo in port forwarding tabs
Merge pull request #31 from rodis/akanda_dashboard

fix redirect url for table entries deletion
pretty item daypart text
pretty usernames
add gameplay video

Ignore-this: 482c36696bc405bd6110657e4ac66187

darcs-hash:20120519073617-836b1-504fae9e6d919ee8aa8293444be2c6b292377622.gz
ICON更新
create organisation
add messages for GTFS and Failed exports
add missing form:inputs
synchro ninoxe
add subscription
refactor clean_up
change +/- char with icons
correct css for create and remove download for wrong exports
fix organisation. Refs #111
merge
fix migration to user
correct validation
Give a try to a nice syntax without long terms
Fixed file coding header
Comme quoi c'est pas la longueur qui compte
Et avec des :: ?
fix Referential creation
fix referential creation in support
Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2
update help introduction
Seeing if the test having a module makes any difference
We now ensure that 'offset' going into readdir() is always (0). We now encode the filenames into the character-set returned by sys.getfilesystemencoding(). We now re-encode the two components of a path-combination operation, as well (to make sure it's consistent). Bug-fixes associated with display entries in subdirectories. Done.
Added file-type versatility goal to readme file.
Add void param to function without args.
debug_printf format should be const.
Add missing include to parse.c
asf_seek_to_msec absolute ms param should be unsigned.
Silence some harmless unsigned vs signed comparisons.

In the future the whole seek unsigned vs signed API decisions
should probably be revisited to avoid this casting?
Enable some additional warnings.
Use uuid in the name template in the hypervisor and fs

Use the instance UUID in place of the 8 hex digits in the
instance name.

Change-Id: I112adac49b06de127fd5e00af4613b04b510a2ea
B) Use keystone config files from source; move to /etc/keystone

* Put all config files in /etc/keystone
* keystone.conf rewritten
* logging.conf.sample rewritten to logging.conf
* default_catalog.templates copied from devstack/files

Depends on https://review.openstack.org/5879

Change-Id: Ic7060ef897e47495cd08ca3786e49fdebadf6723
Move swift defaults for config & data

* change config vars _LOCATION to _DIR to be consistient with other vars
* let config files live in /etc/swift like they want to
* move swift backing files to $DEST/data/swift

Change-Id: Idbd507736b46c5c2330e0255cc87f40068d3faf6
Pull stack.sh sanity reorg from multi-distro

Change-Id: I5b9e64c4dc024a9ad90bd4f7e5ed86d601c0f610
Add local.sh support and samples of local.sh and locarc

Run $TOP_DIR/local.sh at the end of stack.sh if it exists and is executable.
This allows the user to automatically perform local actions on every re-stack,
such as creating custom flavors or specific tenants/users.  Like localrc, this
file is not distributed with DevStack so user modifications will be undisturbed.

Add local.sh to .gitignore

Examples of local.sh and localrc are in the samples/ directory.

Change-Id: I0be6b4d80ce084981cac8a3a8f1dc9bc8c3bbd4e
A) Add/move functions to 'functions' file

Add ini*() and tests
Add GetOSVersion()
Add install_package(), yum_install()
Add *_service()

Change-Id: I570dba5ed4d2b988cdd1771cf6bed0aaf8e0fe27
unify AMI handling

Change-Id: Ia7d88d53760f571c6a488c3139049502b484d33e
Merge branch 'milestone-proposed' into dt-test
Merge branch 'func-add' into dt-test
Merge branch 'scripts' into dt-test
Merge branch 'unstack' into dt-test
Merge branch 'keystone-conf' into dt-test
Merge branch 'swift-conf' into dt-test
Merge branch 'stack-org' into dt-test
Merge branch '5584-uuid' into dt-test
Merge branch 'tools-updates' into dt-test
Merge branch '5579-quantum-image-redux' into dt-test
Merge "Properly generate the hardstatus for stack-screenrc."
Use glance config files from source tree

This rewrites the config files for Glance API and Registry (-paste.ini and .conf)
rather than use templates from devstack/files.

Fixes bug 950289

Change-Id: I90151e36bb5f778499481e9abe0d8637d41f19aa
Check for audio hotkeys in both key down and char hook

wx doesn't call the keyboard hook when a window has capture, which
results in hotkeys not working while a mouse button is held down. This
usually doesn't matter much, but in the audio display one might want to
play audio while moving a marker. In general checking for hotkeys in
keydown doesn't work, but in the specific cast of marker dragging
keyboard focus is guaranteed to be on the audio display so it works out.

git-svn-id: svn+ssh://aegisub/var/svn/aegisub/trunk@6931 93549f3f-7f0a-0410-a4b3-e966c9c94f04
Fix potential crash when deleting lines with audio open

Don't assume that the active line is valid in RegenerateInactiveLines,
as it may get called by the commit signal before the selection is
updated when the active line is deleted.

Closes #1502.

git-svn-id: svn+ssh://aegisub/var/svn/aegisub/trunk@6932 93549f3f-7f0a-0410-a4b3-e966c9c94f04
Implement the timing adjustment commands

git-svn-id: svn+ssh://aegisub/var/svn/aegisub/trunk@6933 93549f3f-7f0a-0410-a4b3-e966c9c94f04
Regenerate aegisub.pot

git-svn-id: svn+ssh://aegisub/var/svn/aegisub/trunk@6934 93549f3f-7f0a-0410-a4b3-e966c9c94f04
Fix manual path generation

git-svn-id: svn+ssh://aegisub/var/svn/aegisub/trunk@6935 93549f3f-7f0a-0410-a4b3-e966c9c94f04
Added .gitignore
Color picker: don't restrict the sizes of the ASS and HTML boxes.
Shift times: Make Enter in the time edit do the same as clicking OK
Shift times: Use TimeEdit::SetTime() instead of TimeEdit::SetValue()

TimeEdit::SetValue() will trigger TimeEdit::OnModified(), but that
doesn't always update the internal "time" property.
TimeEdit::OnModified() seems to be designed to handle editing the value
with the keyboard, not with SetValue().
Use correct format specifier in AssColor::GetSSAFormatted()

Avoids a ton of assertion failures when saving SSA files.
Don't load audio from video twice when loading linked files

It could happen if "Automatically open audio when opening video"
was checked.
Added more Zebra example
Add code to see what projects a user contributed to from a list of urls
Styling on "new" form
Fixed Files; Corrected Logic
Fixed Files
Marfa, Texas. :v:
dartling images; dartling image used in README
Correct parse error in RC.re_log, detect moves correctly.
Added Twitter Bootstrap.
Added dev tools to composer.
Bug fix in the `save' function for the case a directory name is passed with a trailing slash (added e.g. by the completion system).
add tmp/pdf directory (#12189)

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10702 e93f8b46-1217-0410-a6f0-8f06a7374b81
scm: fix revision graph left padding

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9621 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merged r10801 from trunk (#12349).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10819 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merged r10790 from trunk (#12294).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10820 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merged r10810 from trunk (#12359).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10821 e93f8b46-1217-0410-a6f0-8f06a7374b81
Backported r10792 and r10793 from trunk (#12310).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10822 e93f8b46-1217-0410-a6f0-8f06a7374b81
fixed mono build
initial version of the presentation
added choclo iterm theme
Fix issue #82
trait parents
v4

refeito o calculo do x e y
Add junit-4.10 dependency
Rename mutating functions to have ! suffix.
Allow node >= 0.6.2
Modify `evil-define-text-object' calling body only once

This changes the interface of evil-define-text-object. The body of a
text object is now called exactly once (when called interactively).
Furthermore the framework code of `evil-define-text-object' assumes
that the body handles the extension of the current visual selection on
its own. The current implementation of most text objects does *not* do
this; this has to be fixed in subsequent changes.
Let `evil-define-text-object' forward interactive statements

If an interactive statement is given in a text-object definition, then
it should be forwarded to the underlying `evil-define-command'.
Add interactive code <v> for visual region
Add visual range parameters to text objects

All text objects take now three additional parameters describing the
current visual range. These are filled by the interactive code <v>.
Change inner/outer object range selects for new interface

Adapt those functions to the new interface that passes beg end and type
to the text-object body.
Change `evil-paren-range' to new text-object interface

Make its behavior dependent on the currently selected range given by
the parameters BEG, END and TYPE. This addresses #155.
Change `evil-regexp-range' to new text object interface

Changes also `evil-xml-range'.
Use /bin/sh as shell in Makefile

/bin/sh is more standard and sufficient on non-Linux systems,
e.g. NetBSD.
Fix update of version info

We dump the new version info to evil-pkg.el.new which is renamed
afterwards. Redirecting the output to the input file does not work and
results in an empty file.
Fix the examples update task
updated backbone folders
Merge branch 'brijtalk-backbone' of https://github.com/emson/uiexamples into brijtalk-backbone
Update array data size to fix breakage on 32-bit platforms
Break lxml dependency
Add Travis CI control file
Remove time tests from base test cases.
FIX: *Really* fix tab-tooltip issue.

Setting tab tooltip on addTab rather than add_editor to make it work after split/collapses, since addTab gets called when splitting/collapsing.
Merge pull request #49 from agrawalprash/fix-tabtooltip

FIX: *Really* fix tab-tooltip issue.
Test case for assertions nested inside the assertTraits blocks.

They prove that the context managers work as expected in
those cases.
Finishing the Result class, some documentation added
Deleting the kqoauth directory.
DOC: Add an example showing off the embedded Qt console.
CSS Panel - Fix layout when editing long CSS values.
CSS Panel - Add some padding to editable values
Add a key to increase memory size while a stream is open.
minor doc bug.
Added some extensions to wireup.java.
Run bootstrap_cmds before bootstrap_python_modules, fixes issue:251
Started tidying up the actual output a bit. Got a lot more to do still. Adding usergroup permissions tomorrow.
Make /usr/local/git/bin first in PATH if exists
use rsync to update files
JCR-1983: Create branch for eXo JCR 1.16.x
JCR-2026: Cleanup the pom files to be able to get rid of eXo build
JCR-2026: Cleanup the pom files to be able to get rid of eXo build (jdom)
ECMS-4044 CLV setting: Impossible to select content from search result (Firefox, Chrome)

Problem analysis
* Cause: the modification inside EcmContentSelector.addFile2ListContent() function (ContentSelector.js, ECMS-3853): title attribute becomes mandatory.
* Consequence: EcmContentSelector.addFile2ListContent failed in UIContentSearchResult.gtmpl
* There isn't any problem in IE because it just ignores the null exception and continues working.

Fix description
* Add title attribute for node object
ECMS-3670 CLONE - Upload via WebDAV generates node names based on meta data instead of filenames
Fix description:
Add lacked mixins when upload via WebDav: mix:i18n, mix:votable, mix:commentable, exo:rss-enable
Set exo:title as file name.
Accidentally changed the gene_mutate_variance in the PolynomialOrganism to a value that almost guarantees failure
edited gitignore to include Web.Debug and Release configs to ignore list
removed donation type from export method or donations
Merge pull request #16 from extofer/export-bug

Export bug
Added .bashrc, rainbow_parens.vim, tweaked grep open file screen shortcut.
Add alias for sprunge.us
Update German translation to match untranslated TS file
Remove outdated warnings and config instructions from simple_httpclient.
Allow default HTTPRequest attributes to be set globally via configure.

Closes #379.
Fixed issues found by adamv

no more hard-coded gcc
now with dylib shininess
AND no more non-libs in the lib dir
implemented asynchronous ingestion
Improvements and class refactoring
Improvements and class refactoring
Merge branch 'abstracttypes'
Header Properties: returns all the matching headers from the
Net::HTTPResponse
Merge pull request #11 from kdridi/master

Headers properties
- Added missing check for NULL
Modify tools/webserver to read $HOME/.felix/webserver.config.

Allows client to set search paths for C, Felix, Fdoc
and plugins. Plugins aren't implemented yet, but this
feature seems essential to allow the webserver to actually
find them.
Fix bug in new short RE2 match.

Result array was 1 too short.
add tnc-fhh
add jmp instruction.
Update README.md

* Added Tripwire component. (entry)
Fix declaration of prototypes for functions in C
Added the ability to pass in the global DLR scope to the compiled lambda.
Refactored LuaScriptCode to accept the LambdaExpression and compile it just before running it, and to pass in the scope to the lambda when running.
Updated the Scope class to hold the DlrGlobals parameter for accessing later.
Updated Generator to created a lambda that accept a IDynamicMetaObjectProvider parameter for the global DLR Scope.cs
Added a _context field to binders.
formatting issues
more strict type definition for card()
get_random_card/1 fix
application skeleton added. Now it is possible to run tests
Somehow the test WhenQueryingForUserById is now passing by this change
Remove no needed project
Fixes #76, try to call out volo add processing package.json by itself.
readme tweaks, based on discussions with @jlongster
Add details on when sudo may be needed.
Tweak voloLib path to resolve against test directory instead of cwd
Merge pull request #84 from DamonOehlman/master

Run Tests from Any cwd
Fixes #71, setRawMode not using deprecated tty call for node 0.8+
Merge branch 'master' of github.com:volojs/volo
Fixes #87, allow local zip files when calling create
Fixes #88, make sure skipping of version control directory copying is stricter.
Exploring #74, not done yet.
Fixes #74, do not strip off too much from dot-separated names.
Fixes #79, allow semver ranges in the version tag part of archive names.
Relates to #79, allow search/semver archive names.
Also move a test for create from add over to create set.
Merge branch 'bug74'
Fixes #86, allow directories for fragment IDs.
Fixes #83, run volo add as part of create if package.json for project has volo.dependencies
Fixes #78, inform user of exact conflict.
There is no option to resolve as part of install, but instructions on how to run volo add with a -f after.
Update README to have dev/debug/test info, fixes #51
readme typos
Move the dev stuff to the dev page instead of having it in the readme.
Bug Fix: Handle existing ratings
Added support for embedding expressions in strings
Increased bignum precision/range, made it use allocation batching
Fixed init check in  bignum
New files and fonts
Se cambia el ejercicio a OOP.
Corregido conflictos
[api] http: add stream/query options for auth/path.
Fix equalizer-saving.
Fix saving of theme-fonts.
fixed playlist keyboard handling
small adjustment in screen song theme for better keyboard navigation in playlist
Log error when song is not found from playlist.
Merge branch 'medley' of github.com:Vocaluxe/Vocaluxe into medley
Added preliminary get_command.
Fix for Lite_Floor theme
hopefully fixed black overlays for all scenarios
Merge remote-tracking branch 'origin/master'
Different fix that keeps darken option for normal infopanel
Fix system info
Small changes to system info
Re-implement difference between light glow mode and no glow mode
forgot to add
Merge git://github.com/BigNoid/Aeon-Nox
comic background change
Merge remote-tracking branch 'origin/master'
...
mouse support for videoosd
Update Icelandic language
Merge pull request #330 from Passer/patch-10

Update Icelandic language
reworked dialogvolumebar
Merge remote-tracking branch 'origin/master'
icon cleanup / changes
...
converted backgrounds to greyscale
sub menu pictures and color actor
whitecase
Modify *.bat files error for android(win32)
Merge pull request #1144 from John-cdy/gles20

Modify *.bat files error for android(win32)
Quoted use of bash variables
Cleaner build scripts
Cleaner template of build_native.sh used by projects generated with create-android-project.sh
core: remove obsolete file UPGRADE_0.3 (move part of content into file NEWS, for version 0.3.0)
core: remove obsolete directories from .gitignore
core: fix cmake target "dist": build tarballs using git-archive and not cvs
core: add dependencies and remove instructions for autotools in INSTALL
doc: add warning for autotools in user's guide
script: do not define _XOPEN_SOURCE on OpenBSD (bugs with gcrypt) (bug #37373)
logger: do not define _XOPEN_SOURCE on OpenBSD (not needed)
Accept gdt table col_index method without initializer function
Improve gdt table reduce to skip undef values
Implement statistical function for gdt barplot and lineplot
Fixed a timeproblem. Highcharts working
We're getting closer stil I feel
netifd: update to latest version, fixes adding an alias during config reload for an interface that is already up

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34006 3c298f89-4303-0410-b956-a3cf2f4a3e73
ath5k: fix skb leaks (should fix #12199)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34603 3c298f89-4303-0410-b956-a3cf2f4a3e73
mac80211: ath9k: fix OTP register offsets for AR9340

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34605 3c298f89-4303-0410-b956-a3cf2f4a3e73
mac80211: ath9k: allow to load EEPROM data via firmware API

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34606 3c298f89-4303-0410-b956-a3cf2f4a3e73
mac80211: fix possible NULL pointer dereference in ath9k

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34624 3c298f89-4303-0410-b956-a3cf2f4a3e73
don't use permid
Highlight items with submenus.
Added msgpack serializer
Add support for prev and next link relationships
Add MVC service factories for Filters and Validators
MVC service factories for Filters and Validators fixes and unit tests
Cs fixes
Add fromString() to restore mail message from string
make Mail\Message::fromString() method static
update emails used in tests to @example.com
Deprecate getPropertyNames and change to getProperties.
Undo deprecation and implement PropertyScanner
Updated international float to return true if values are equal as previously string(5.00) did not equal int(5) after it was parsed
Added test case for string('5.00')
[#2333] Add todo annotation

- Added @todo annotation so it's discoverable via API docs
apply: added very simple benchmark for Apply function
kc_base_test: added a benchmark for Set and Get
Modify bash prompt
Merge branch 'master' of github.com:fudanchii/myconf
Automated update of .build_number to 195 for branch master
Last update: b47f56c6a9ea7686a3d7ecf0fd9d981fa3871ccc (2 commits ago)
bug fix: updated file_proxy.php to use legal_file helper instead of hard-coded list of movie file extensions.
bug fix: updated uploader.php to use legal_file helper instead of hard-coded list of movie file extensions.

Fixes #1926
adding default settings to Tasks.created
add smallobject_allocator
Swapped input and object EmployerSalaried in main.
$(DESTDIR) fix #2
Settings for oracle-old and mscash (GCN) were wrong
Tests updated
waypoint_upload Tidy useless comments
Google Maps layer kml test
add optional friendnum param to friend class
Add support for repository subdirectories
Merge pull request #17 from jkadijk/master

Support for subdirectories
Refactoring package structure and class names
Refactoring URL space and UI messages
Another ref to view
Dont try sending to an empty list of users
use direct class instead of interface
Assign series version 2.1
Add setup.py artifacts to .gitignore
Update setup.py classifiers
Merge branch '2.1-maint'

Conflicts:
	euca2ools/__init__.py
improve cscope ctrlp quickfix usabiliy
demonstrate workaround
Adding colour to the completion indicator
added class border fancy tab class
youtube: fix carrousel showing several arrows
局部调整
Signed-off-by: NameJun <122419795@qq.com>
fixing up css file
Shortened text for image captions
No sh-- comment. Got to cut the use of these.
fix the file path of sample rule
zsh: @@NDL for newest download
Some aliases from official git wiki

https://git.wiki.kernel.org/articles/a/l/i/Aliases.html
Turning words into list
.vimrc: F1-F12 keys changed
.vimrc: g<C-v> - select previously changed text
.vimrc: filetype-specific stuff
.vimrc: ack is ack on Arch Linux
.vimrc: <C-N>, <C-P> cleaned up
.vimrc: better Fuf usage
.vimrc: get rid of Pathogen
.vimrc: golang support
.vimrc: ultisnips support
Added x-run-here
xmonad: add manage hooks
xmonad: MOD+p spawns dmenu_run
xmonad: use x-run-here for vim and sakura
汇编转换成c
Add bin/fibrous - starts fibrous REPL
Fibrous coffee REPL.
Update README with fibrous REPL
norm constraint, more fixed_var_descr
some changes for doc
Config code for jdbc query runner
add second select
1. Make bit fields return numpy arrays like other dimensions, rather than generators.
2. Fix typos
3. Add ground detection to tutorial.
More recognizable inspection for Celluloid::Supervisors
Convert errors from dying Celluloid::IO actors into MailboxErrors
Initial ghetto Celluloid::Application implementation
Apparently the fashionable thing to do is to NOT check in your Gemfile.lock.

I can't ever keep up. Scumbag Yehuda's blog says both to check it in and not to. Gems generated with "bundle gem" include Gemfile.lock in .gitignore by default so I guess that's the proper thing to do
Implement Celluloid::Applications as Celluloid::Actors
Get rid of Thread#kill usage
Get rid of 1.9.3 for now since Celluloid is triggering GC bugs
A nicer API for Celluloid::Actor::Pool
Refactor some megamethods in Celluloid::Actor
Add an attr_reader for Celluloid::IO::Mailbox's waker object
Allow a custom event loop with Celluloid#event_loop
DRY up Celluloid callback handling
Rip out custom event loop crap and replace it with custom mailboxes
Fix broken implementation of Celluloid.with_mailbox
Rename 'with_mailbox' to 'use_mailbox'
Supervisors handle actors that crash when started
Note JRuby 1.6.5 brokenness
Workaround for broken Fibers on JRuby 1.6.5
Let's go shopping!
Reraise fiber LoadError from JRuby if we don't know why it happened
gvim: larger default window, no menu
environ: add git-git
tig: add a toggle-graphic key
Changes output of command 'killall' to reflect quantity of entities removed, addresses VANILLA-176

Signed-off-by: megagamer410 <megagamer410@gmail.com>
Merge pull request #323 from megagamer410/master

VANILLA-176 Fix
Fixed chunk load failure.  Something is broken with the direction part of teleport to transform though
Probably a more efficient way to do this
Reduced ping timeout by 50% again
Sends 4 pings per timeout period (one ping every 7.5 seconds)
Added ping to player list message and fixed bug with removing player from the player list on log out
Fixed meta issue with BasicEntityMobProtocol, added testing spawnmob.
Signed-off-by: Chris Sanders <zidane@outlook.com>
Revert "Fixed meta issue with BasicEntityMobProtocol, added testing spawnmob."

This reverts commit 2c058bbb533640c9b0f36a44e20049a0dc7500c1.

Did not mean to commit this...
Signed-off-by: Chris Sanders <zidane@outlook.com>
Fixed meta issue with BasicMobEntityProtocol, added test spawnmob (only
spawns an enderman right now).
Signed-off-by: Chris Sanders <zidane@outlook.com>
Enderdragons no longer break clients when spawning (it is required to send
meta 16 on spawn which is the boss health bar...thanks a lot Mojang).
Signed-off-by: Chris Sanders <zidane@outlook.com>
Fixed EntitySpawnVehicle to do more than fireballs, added more to the
spawnmob command (so you can spawn other mobs, not ideal but works for
now). Fixed support for smooth falling blocks that work past sand and
gravel (any VanillaBlockMaterial should work). Go ahead and try it out
with ;).
Signed-off-by: Chris Sanders <zidane@outlook.com>
NPCs are back.
Signed-off-by: Chris Sanders <zidane@outlook.com>
Cleanup component branch

Signed-off-by: Walker Crouse <walkercrouse@hotmail.com>
Put PlayerInventory in the data map

Signed-off-by: Walker Crouse <walkercrouse@hotmail.com>
Update windows correctly

Signed-off-by: Walker Crouse <walkercrouse@hotmail.com>
Try to add to quickbar first when adding materials

Signed-off-by: Walker Crouse <walkercrouse@hotmail.com>
Hunger / Exhaustion / Food properties re-implemented. Axed the Gamemode components.

Signed-off-by: William Lebel <lebelwilliam@gmail.com>
Added more search test specs; added sort: function to search and used it in links to parent/child searches; changed si: to apni: as a clearer field descriptor for source_id searches.
Version bump
Add attr_accessible for icon field of Taxon

[Fixes #1445]
attr_accessible for name in shipping_categories

[Fixes #1443]
reset cycle through CSS styles, fixes #1427
don't render :commerce_tracking flash messages, fixes #1428
Tidy up state_list partial, move 'New State' button to top
Added attr_accessible for name and abbr in state model

Fixes #1430

Remove pending + useless assertions from states_spec

(tests by Ryan Bigg)
Fix update attributes on Flexi Rate Calculator

Fixes #1435
Fix selective brand filter for multiple values

Merges #1438
Make product name on admin/products#index clickable to go to edit for that product
Product#images are sorted by their position [Fixes #1446]
Adding ProductProperty setter + getter on Product

Merges #1452
Fix broken product_spec test due to incorrect use of a non-existent image factory
Clean up states spec so that a country + state are created for testing purposes
Correct namespace for Image class in product spec
Really correct namespace in product_spec
Remove duplicate attr_accessible :attachment declaration and fix broken spec

Fixes #1454
Move jquery and jquery_ujs back into core/app/assets/javascripts/admin/spree_core.js to not break backwards compatibility
Pass bucket name to make product_spec tests on Travis happy
Don't use protection for Image creation in product_spec
Run RSpec and Cucumber by default
Users can sign in
Users can sign up as a tenant.
WIP: Continue to add test coverage, apartment spec is failing.
cleaned up apartment and apartment_spec
Factored out landlord and tenant

* deleted the models and respective unit tests
* changed inheritance_column on User to empty string
  hopefully this doesn't cause any problems
cleaned up photo and photo_spec
Merge branch 'dg-refactor-tests' of github.com:griffindy/Rently into dg-refactor-tests

Conflicts:
	spec/models/user_spec.rb
Added a README.  It is kinda empty for now.
Attributen File hinzugefuegt
restore version file
Move deprecated stuff to its new location.
Remove IPv6 tokens
added modmap to switch capslock and left control
ohpe_mod aloitettu
Repeat bars.
Volta brackets.
Use Append().
Make convert more private.
Sort, bugfixes.
More slur data.
Add note about slurs.
Make read more private.
Slightly smaller credit image.
incident track
Corrected Tree ordering functions; fixes issue #319
added initial stuff to the file
doesn't do proper error handling, but can catch most things
works in general
Merge branch 'master' of https://github.com/heidtn/Project_0
Responsive

Adecuacion hacia Responsive Design Parte 1
Oct 8 work
allow constraints of values to be defined in composite
test making an order
User,UserGroup機能の追加
name changed to weto
name changed to weto, don't really know if this is god or bad...
Core/Calendar:

- simplified the code, removed unused fields from CalendarEvent struct and from DB
- corrected CalendarInviteStatus enum
- moved all calendar enums from SharedDefines to CalendarMgr
- implemented "event was removed" in-game mail
- fixed pending invites
Multi-line text display.
running sprites
Revert "[maven-release-plugin] prepare release woinject-1.0.1"

This reverts commit eb5da6a4c710d43bd3a0f5ad3fc8634eacf1d79c.
hen fan
vimrc stuff
minor tweaks
added picklive's game client as an example app
removing obsolete error case.
Adding Wunderkit as an example app.
fixing typo in Wunderkit description
Refactor some tests.

* Use object for lastRequest to prevent errors.
* Ensure setDOMLibrary tests are cleaned up.
Merge pull request #940 from braddunbar/test-refactor

Refactor some tests.
Add tests for #906.
Adding the Khan Academy as an example app.
Merge branch 'master' of github.com:documentcloud/backbone
Adding the Khan Academy as an example app.
fixes #946 - documentation for changes to `set`
Merge pull request #942 from braddunbar/wraperror

Add tests for #906.
Add tests for #908, #933.
Merge pull request #941 from braddunbar/test-933-908

Add tests for #908, #933.
Merge pull request #947 from braddunbar/upgrade-notes

fixes #946 - documentation for changes to `set`
removing old trajectory link.
removing old trajectory link.
fixes #946 - documentation for changes to `set`
more documentation on upgrading and change events.
more documentation on upgrading and change events.
more semantic xsl
Fixing onboot scritps
- tagit bort after_save :export_to_company och gör company.revenue direkt istället

- refactorat mycket av koden i ProductCategory för renare view

- flyttat Index_incl i product-index till direkt efter namnet
add texcount summary make rule
fix timeout settings using set
Merge branch 'master' into biomart_timeout_fix
Cleaning up and hiding 'under the hood' bits
.obj から呼ぶ exe の関数が最適化で消えないように対処
@mecathcart @hisakonog im turning off debuging output, if you want to turn it on, just type Utils.debugMode = true on the commandline, and then watch the debug output roll by...
Merge branch 'master' of github.com:iLanguage/iField
I dont think it was doing unique nodes before, now trying to make them unique so only new ones are added, and only have one morpheme-gloss-value set per morpheme gloss pair
adding uniqueness checking in the LexiconNodes add function

There are three types of settings for the add options, adding comments to each and seting it to overwrite from the server and uniqueness so taht we wont doubling of nodes each time the user syncs from the server.

also building lexicon on blur morphemes as well as blur utterance since it is highly likely the user will want it
Merge pull request #393 from cesine/master

Inserting nodes into lexicon only once, taking the most recent node.
Concertado os dias uteis no Config
initial integration of Foundation
Added font smoothing
Updated the blog post & styles
Merge branch 'master' of https://github.com/iamtimm/awsme.me
Upped the version, removed webhooks
Improve variable in homepage
Added Duo Security 2-factor auth for admin views.  Allow MEDIA_URL == STATIC_URL.
Bug fix - /etc/bootrc is no longer present in the initramfs
More cleanup.

- Removed wbar and the Clarity icon theme - wbar is of little use because of
  gRun and cwm's application menu.
- Removed /etc/desktoprc, which causes confusion.
- Disabled automatic startup of the X server (again) and desksetup.
- Added Vim and Irssi to the cwm application menu.
AJAX:dummy data parse
Merge branch 'master' of github.com:ikedahidenori/su
imagesources: If VIGRA is not up-to-date with latest github repo, use slow colortable implementation instead of crashing.
Paketin nimi vaihdettu
.gitignore lisätty
added rebase for faster graph moves.
Completed testbed experiment
Merge pull request #122 from ims21/master

playback status in movielist
cosmetics in Eventview
Initial commit of multiprocess kmeans
index.html

埋め込み方法記載
Updated the readme to reflect new changes and clarify various stuff
Fixed merge conflict in README
Started implementation of Parser::convertClassic() with passing test for simple classic hCard
Added compatibility map for hCard
Merged initial implementation of classic compatibility
Added screenshots and icons for release
Remove ICS-only use of Space - View is more compatible
pmc available publication list
Add comments regarding pref changes
Basic user management is started.
Testes para o operador de selecção Torneio.

Ass: Pedro Alves, Pedro Isidoro e Aurelien Mota.
Cleanup
More trees added to quick tree dumper
Fix progressBar junk when 0 events pass
Add AA, AI, IA control region trees
adding eclipse ignore entires
Renamed Ride classes to Month classes.
-Further tweak to the data sanitizing, should work a lot better now.
Merge pull request #532 from mmcguinn/visFix

-Further tweak to the data sanitizing, should work a lot better now.
Pushing create.js
Merge pull request #62 from hmcq6/createjspush

Pushing create.js
-Moved export buttons to bottom-right to avoid conflict with reset zoom button.
Merge pull request #439 from mmcguinn/highvis-compat

-Moved export buttons to bottom-right to avoid conflict with reset zoom ...
-Server now cleans non-numeric data from numeric fields before sending data objects.
Merge branch 'master' of github.com:isenseDev/iSENSE into mmcguinn-175
Merge pull request #183 from mmcguinn/mmcguinn-175

Mmcguinn 175
ssa for loops seems to work
Minor mod to tiling transform.
Merge branch 'master' of https://github.com/iskandr/parakeet
Fixed deprecation warnings in transaction spec
more deprecation warning fixes
Merge pull request #6 from isotope11/fix_deprecation_warnings

Fixed deprecation warnings in transaction spec
added comments and fixed dateFormat attribute
added rest data source processor
progress on mongodatasource
fixed collection parsing and updating of resources
Merge remote-tracking branch 'origin/dev' into dev
fixed optimizing of spaces for raw plugin
fixed document reference in MenuButton
create application context with window instead of document
fixed optimizing of spaces for xaml plugin
improve AutoClose
Commit dev branch
add argument parsing docs
Friday, solving infrastructure fixed
wip: use int value Debug instead boolean
Added gzip-enabled curl alias
https://github.com/mathiasbynens/dotfiles/commit/1aeba0cba820db7f412536cb8aed30f28ec1a9a8
.osx: Check for software updates daily
https://github.com/mathiasbynens/dotfiles/commit/928dee6f7e04995c165d859a570d6138ac1416fc
Correct Dropbox::API::Client#find behavior with directories

The previous implementation did not return the correct directory.
Instead it returned the first file/directory residing in the requested
directory.
manifests support file concatting
0.6.12
Added skelet of match object.
syntax highlighting for coffeescript
Merge branch 'master' of github.com:jamesob/dotfiles
Handle empty lines
Update method setName() into Window class
Added social stream
new file:   category.php
	modified:   options.php
	new file:   settings.php
tried out median filter for the altitude - doesnt work well. some changes in the scheduler.
copied FreeBSD softfp add/sub implementation. mul/div is to be copied yet
pyrev removed
Reduce the amount of traffic in cluster lock aquisitions
jboss-classfilewriter 1.0.2.Final
AS7-4433 AS7DataSourceDeployer#setMcfProperties() never reads TimeOut#isSetTxQueryTimeout property
AS7-4598 Allow configuration of JASPI auth-module control flag in the security subsystem.
AS7-3997 Allow the jacorb socket bindings to be specified via attributes of the orb element in the jacorb subsystem.
Deprecate the alias resource definitions since this is not totally working yet and might change
JBTM-1276 updated to nuke inprogress rebase
alterando menu de agente de saude executa meta Adim
Bug: alterando label d eenfermeiro executa meta
retirando cenario
atualizando
atualizando
atualizando
Removing more emacs stuff
More emacs cruft
I'll get all of these files one day
Revert "Wait until the parent Terminus has loaded before connecting. This should make frame specs more robust."

This reverts commit 8bfec244991febbe46863ad87db6d6ef0967db04.
Bump Pathology; fixes queries for form fields by name.
Update Android build report.
Actualizacion de las vistas de members y prospectos. Ademas de modificar
los queries del Modelo
Formatting
Merge branch 'ta-2.8' of github.com:jd28/nwnx2-linux into ta-2.8
don't allow users to create unsafe JNum's
don't allow users to create unsafe JNum's
Instance variable cleanup
Automatic commit at Sun Sep 16 14:00:02 MDT 2012
Added pause ability
Added core for forfeit
Merge branch 'master' of github.com:jellea/42seconds
Fixed lighting by generating facet and vertex normals
Render devil duck (but with wrong scale)
Cleanup
Rewrote and renamed getChildrenSerially, to be far simpler and accurate.
Emulator: implemented addr reg indirect with index mode
Emulator: implemented PC with displacement mode
Emulator: fixed typo in register file
Unit tests: changed DRAM test strategy
Interrupts: changed some globals to static
DRAM: implemented refresh according to the spec
DRAM: decreased loop counter word size
DRAM: implemented basic read according to spec
DRAM: implemented basic write according to spec
IO: added exception in writeIO for all-ones masks (no R-modify-W)
Makefile: added gcc assembly output target
DRAM: added clarification comment for DRAM size
SPI: added parameters for sram; improved divider commentary
SPI: added quick slave select function
SRAM: implemented read and write for single bytes
SPI: removed needless read/write masking
IO: added correct slave select pin definition for sram
SRAM: implemented sequential mode for reads and writes
Unit tests: added tests for sram in byte and seq modes
Makefile: split program out into flash and eeprom programming
rpkm scripts
Rebuild of irc logger
Fixing .vimrc mistake.
'testing fugitive'
Refactored the backbone views to be more generic.
This paves the way for browsing and searching templates.
XML fun
some low hanging performance
v0.0.44
factorize before_filters and layout for projects related controllers
layout selected by controller name
Merge branch 'master' into simplify_controllers2

Conflicts:
	app/controllers/commits_controller.rb
	app/controllers/refs_controller.rb
update new controllers
rename ProjectController to ProjectResourceController
Merge pull request #1569 from jouve/simplify_controllers2

Simplify controllers and layout handling
tests for: Profile -> History
Move ProjectHooks from spec/requests to spinach
blue hover
Fix deletion of tmp/gitlabhq-gitolite* folders in a NFS environment.

When working inside of a Vagrant box with NFS enabled, the deletion of a
repository in tmp/ doesn't work every time.

It is related to NFS inability to delete a folder if it's still used by
a resource (e.g. `rm -rf ./folder` would leave the folder and a .nfs*
    file in it). In this case it's the temporary repository which can't
be deleted because `ga_repo` is still using it.

De-allocating ga_repo is not possible (thanks Ruby), but deleting the
folder it points to in the first place fixes the issue.

Reference:
http://stackoverflow.com/questions/11228079/python-remove-directory-error-file-exists
Merge pull request #1582 from Kouno/nfs-fix

Fix deletion of tmp/gitlabhq-gitolite* folders in a NFS environment.
commit show page styled a bit
fixed some grammar stuff

Fixed a few things (wont -> won't, "a code")
Merge pull request #1590 from thomwiggers/patch-1

fixed some grammar stuff
Fix completion for per line forms
Merge pull request #1594 from riyad/fix-completion-for-per-line-forms

Fix completion for per line forms
remove unnecessary step from install guide
Refactored events output. Added links to authors of events
Refactoring event views
Use class instead id for css styles
add comments on css
Fixed going forward
Merged
Add autowrite to make Qdo practical, it now saves each file as it goes.
Revert "Minor code fixes"

This reverts commit ff640c242ebb2e719d908e96ffb3fbad6aecc9d6.
further fleshing out of the Simulation class
Updated travis settings for our branch.
deindex removes from mongo db (needs testing)
got declarative logic pretty well complete
Db4objects.Db4o.dll
Fixed bug where extra newlines were added to csv file
[WHITESPACE] Fix indentation of Xapi.bring_up_management_if function

This-is-only-a-whitespace-change proof:

$ git diff -w HEAD^ | wc -l
0

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
CP-3477: Make xapi listen on all dom0 IP addresses

Xapi now starts listening on all IP addresses when it starts up, and
management is not disabled.

Even though xapi listens on all IP addresses, there is still an interface
appointed as _the_ management interface. Slaves in a pool use the IP address
of this interface to connect the pool master.

It is now no longer needed to rebind the management socket after IP changes.

Changing the management interface with Host.management_reconfigure now starts
the API server in case it was not running, but leaves it alone otherwise.
Besides that, it is only an update of the inventory file, plus an update of the
Host.address field.

Also remove the rewrite-management-interface script, and instead update the
MANAGEMENT_INTERFACE key in inventory file in xapi itself.

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
Remove unused module Xapi_network_types

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
Use HTTP "host" header to decided whether to forward and API call to the master

Since xapi is now listening on all dom0 IPs, API calls coming in on
the HIMN now go through the API server as all other incoming calls.

The different between calls on the HIMN and those coming from outside
is that HIMN calls on a pool slave must be forwarded to the master, while
others do not. We use the HTTP "host" header to distinguish between these
cases.

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
Clean up HIMN code

Since the HIMN connections are now handled by the main api_server,
there are only two special HIMN things to do: getting an IP address on the
HIMN bridge, and starting a HIMN API server in case management is disabled.

This code has been modified and moved to Xapi_network and Xapi_mgmt_iface.
There is now no longer any need for Xapi_network_real, so remove it.

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
Remove a function which already exists in Listext.

Signed-off-by: John Else <john.else@citrix.com>
Merge commit 'b8724d0bffdfb580ff8142663cfcc6bc389cf796'
Merge commit '895fed281c138d2fdad8e3ab5554ac4dce41b42d'
Added start/stop convenience script
user controller updated
main controller updated
my account form added
login box updated
the color for the person is given the ring on the person panel
latest (30%)
Added buttons to lovebird tab to sort by different methods.
fixed line in vimrc so powerline works now
Set up the template for the chase 2013 paper.
- fix some failing tests introduced by #230 (regression check on quoted
  filenames, etc)
- Prefer File.join() when joining paths
Space & Indentation
fix commit + admin update
updated with help from @magnars: if you exit in the middle it hides line numbers again
experimental jump-mode for jumping to next/previous matching character
mandragora
added HUD and plugin for a meny item in Window menu
added week-05 activity-03
Updated TODO.

Signed-off-by: João Sampaio <jpmelos@jpmelos.com>