labofsahil/github-event-dataset-2012 huggingface dataset:
Improve error reporting in `_node.Execute()`.
Typo in comment.
implement array ranges

Now you can do:
  PS> 1,3
  1..3
but the output shows the type (`int[]`) not the values. Later.
TEST: REFACTOR: Extract Method in Ast tests

Since we're doing the same thing over & over.
Parse negation.

  PS> -7
  -7
  PS> 1 + -7
  -6
More array ranges: 5..1, -500..-495
Remove extra comment.
Implement array literals ("1,2,3")
return arrays as `PSObject`s
Merge branch 'integrate-new-parser' of https://github.com/JayBazuzi/Pash2 into integrate-new-parser
tentative patch to close #474

Separate OSError for file missing or file defective
Remove unused lines from grammar
Merge branch 'master' of github.com:Jille/splparser
Remove old tests
Remove compile-time warning
Don't print syntax tree anymore
fix vmg
Clean code improvements it is now more clear why the function updateLogicalPaths in CheckConformanceUtilClass.java returns a boolean
small tweaks to some of the shootout code
make "using Base" implicit, and add baremodule. closes #1522
Added sparse diff
Added sparse diag,diagm,spdiagm
Added sparse trace,kron
sparse: moved structure queries, added diagmm
replace: more tests.

Some of the replace results for zero-width matches are a bit weird,
but they match what Perl and Ruby do. For example, it seems like it
would, imo, be much more intuitive if we had the following:

    replace("abcd", r"b?", "^") == "^a^c^d^"
    replace("abcd", r"b?c?", "^") == "^a^d^"
    replace("abcd", r"[bc]?", "^") == "^a^^d^"

However, I'm hesitant to break with the behavior of Perl and Ruby.
I wonder to what extent that behavior is simply based on being a
bit simpler to implement.
Merge branch 'master' of github.com:JuliaLang/julia
Merge branch 'master' into current_output_stream
mop-up rename HashTable -> Dict
replace: manually inline each_search machinery for speed.
Merge branch 'master' of github.com:JuliaLang/julia
replace: more intuitive behavior for replacing, e.g. r"b?".

This commit implements the more intutive behaviors mentioned in
commit 090657c6c3d6c7182413939afb76a9f6f0390be7, at the cost of a
slight deviation from compatibility with Ruby gsub and Perl s///g.
The only difference occurs when replacing a pattern that can match
zero characters or more than zero characters, which prior to this
would match each non-zero-width match followed immediately by a
zero-width match. Arguably, if your string replacement does this,
it's probably a bug. Same examples as given before:

    replace("abcd", r"b?", "^") == "^a^c^d^"
    replace("abcd", r"b?c?", "^") == "^a^d^"
    replace("abcd", r"[bc]?", "^") == "^a^^d^"
fft: improve performance & tests

Closes #727
Merge branch 'master' of github.com:JuliaLang/julia
Merge branch 'master' into current_output_stream
rename: print_to_string => sprint (like sprintf without the "f").

Also rename print_to_array => aprint (not sure if we need this).
Disable distributions test
Merge pull request #1583 from staticfloat/disttestfix

Disable distributions test
removing some redundant primitives
Update LICENSE-ZopeInterface
no blinking
lavet kompromis med graenser for drasticLikelihood for at daekke ca. lige meget af alle muligheder, men er ikke fuldt uafhaengigt af populationsize/threads
fin de tp
Add project and team pages; link to projects, teams, and companies on the index
parse block statements
enabling debugger gem group by default

unless it is running in travis
fixing env check to look for true
Merge pull request #1093 from jlsherrill/debugging

Debugging
858743 - Stop redirect after login to ajax notices path
Merge pull request #1300 from daviddavis/redirect_fix

Fix redirect to ajax notices path after login
EventDispatcher enhancement
ORM DI fix
Allow returning of instances instead of registering them directly [Packages]
affichage deployment
Merge branch 'master' of github.com:KenTiN/PolyPeer
modification getIP
Merge branch 'master' of github.com:KenTiN/PolyPeer
Oude slotservice code
Merge branch 'master' of github.com:KeyTech/KeyTech
Implementing Noncache Clients
Delete noneeded files
Added Basic HTML file with Canvas
cache expire
add remove object
(wenige Namen übersetzt)
Manually committed: https://github.com/7week/B2W2ger/commit/7eb00ae4eb39b21e53413ef9fe772234af3c3ac0
Update master
Merge pull request #269 from mafiox/patch-154

Translated 2/0317
Fix segfault when SMR'ing
[Stable Version] Uploading final version files
Добавление сокращение для флоу
Merge branch 'feature/git-flow-plugin' into develop
Добавление сокращение для флоу
Merge branch 'feature/git-flow-plugin' into develop
Add maven aliases
Merge branch 'feature/mvn-plugin' into develop
Renamed initapp.js
Added 403 template
avoid using eval in setTimeout
use django URL tag throughout templates
slightly optimize mergeSExpr
add missing case
add explicit sharing combinator "slet", shouldn't be needed too often
mention slet
Clean-up and further comments on bridge modules.
a;fj
Issue 4785 - auto return of a function with in contract
Change semantic order and build fd->vresult lazily.
use gen_loadcse in another place and add gen_testcse
factor out ALLREG and BYTEREG initialization
extract code x86 simplification code away from gen()
hide gen-functions that deal in x86isms

Some of these are probably worth moving out to an x86 specific file at some point.
fix Issue 7983 - ICE with getMember on a unittest member
extract stack adjustment code
missing this adjustment for template methods
fix Issue 7243 - Compiler should call separate function when allocating a struct on the heap
fix Issue 8004 - Direct call of function literal should consider default arguments
fix Issue 8005 - Lambda with parameter type inference should consider default args
Merge pull request #913 from 9rnsr/fix8004

Issue 8004 - Direct call of function literal should consider default arguments
Merge pull request #914 from 9rnsr/fix8005

Issue 8005 - Lambda with parameter type inference should consider default args
Merge pull request #912 from dawgfoto/fix7816

missing this adjustment for template methods
fix Issue 8002 - Excess initial errors when passing template args to non-templated struct
fix Issue 7560 - Base class overloaded methods created by mixins can't be overriden
Merge pull request #915 from 9rnsr/fix8002

Issue 8002 - Excess initial errors when passing template args to non-templated struct
Merge pull request #916 from 9rnsr/fix7560

Issue 7560 - Base class overloaded methods created by mixins can't be overriden
fix Issue 8009 - ICE with bad type inside templated function with delegate
Tradotto completamente in ita.
Fixing for international characters
Add a StaticPages controller
Adds static pages
Finish layout and routes
Insertion de yoyo
reorganized & Wip still bugged :(
fixed error in return structure of 'get_jobs_metadata_fast'
added helper function
cleanup / removal of unused stuff: matrix api
updated for new memcache schema
Merge pull request #145 from teharrison/develop

minor update: api2 and m5nr-memcache
[enhance] stdlib: All calls to user context now throw error in the called thread instead of just print a message
another round of build enhancement so that we can compile from another folder
avoid to use a RB_TYPE_P(). fix #1477 and #1482

because currently MacRuby does not behave like CRuby in RB_TYPE_P().
Attempt to fix Heroku error
Precompiled assets
Place object, Move, Select works!

Signed-off-by: Rikard Johansson <rillee.johansson@gmail.com>
Add write loc
Fixed a README.md error
Processing of group symbolizer no longer alters the original feature context. Instead, new context and features are created for sub features.
Updated XML parser to read group rule filter from child node instead of attribute.
fix init-script-builder
dont hardcode apache group name when setting permissions for state dir
Merge pull request #19 from MarcWeber/fixes/apache-dont-hardcode-group

dont hardcode apache group name when setting permissions for state dir
ClamAV: package virus fingerprint database updater.
Use ext4 for VirtualBox images
renaming all occurrences of /var/run/{booted,current}-system

in particular those found in docs
still keeping old path in modules/config/shells.nix for unkown reason (?)
modules/services/web-servers/apache-httpd: make this module more configurable

 - The new option 'apacheHttpd' determines the version of the Apache
   HTTP Server that's being used by this module. The default version
   is Apache 2.2.x, as before.

 - The new option 'configFile' allows users specify their own custom
   config file for the web server instead of being limited to the one
   that this module generates.
modules/services/web-servers/apache-httpd: add apache user to the apache group
modules/services/web-servers/apache-httpd: rename 'apacheHttpd' option to 'package'
Merge pull request #17 from MarcWeber/fix-init-script-builder

fix init-script-builder
Merge commit 'refs/top-bases/experimental/multi-shell-support' into experimental/multi-shell-support

* commit 'refs/top-bases/experimental/multi-shell-support':
  modules/services/web-servers/apache-httpd: rename 'apacheHttpd' option to 'package'
  modules/services/web-servers/apache-httpd: add apache user to the apache group
  modules/services/web-servers/apache-httpd: make this module more configurable
  renaming all occurrences of /var/run/{booted,current}-system
  Use ext4 for VirtualBox images
  ClamAV: package virus fingerprint database updater.
  dont hardcode apache group name when setting permissions for state dir
  fix init-script-builder
Textbox cursor fix, sizing fix
clear database credentials
Merge pull request #6 from MartijnR/database

clear database credentials
java lib 1.3.1
prace nad lokacjami
pierwsze kroki z google latitude i google maps

-dodano obsługę google latitude
-dodano możliwość dodawania zewnętrznych linków do js

TODO:
-zapisywanie lokacji
-wyswietlanie lokacji użytkowników na mapie
-link do lokacji w menu
-historia lokacji?
ram / fixed ->width calculation happening b4 left nav removal
Because the whole website will use ajax, its easier just to do the validation on the server.
[openstack|volume] Add Volumes to Development Console Helpers

Signed-off-by: Nelvin Driz <nelvindriz@live.com>
working with testclass - error checking bestMovetoTake and
TakeIfPossible
Merge branch 'master' of https://github.com/MrClement/Chess.git
Fixed the route for friendships#destroy to use the delete method, added a test to cover that scenario.
Revert "Flames"

This reverts commit b818d579bd1964603e3b55abe14e142e329269ad.
models tweaks from Aditi
get full stack traces when running GUI from sbt

see #104
don't include Link Breeds Example in checksums tests

perhaps because it uses curved links, the graphics differ slightly
in a handful of pixels between Mac and Linux
Merge remote-tracking branch 'origin/master' into core
Added zip utilities
updated beta site to move facebook login
added new logo
Created icon near URL
preserve redirect_uri for token access
typo fix
Merge pull request #23 from ramm/patch-1

preserve redirect_uri for token access
perf tools: Do not treat warnings as errors

Newer GCC detect more warnings and this makes building of perf not
possible in the upcoming release of Yocto (1.3). We deal with that
making the warnings not fatal instead of changing perf code.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Shotgun in game.
tweaked sound + song
Game over screen and restart
Fixed agent sending proper statecange to connection/monitor
Fixed agent_auth tests.
Fixed test.
Removing business specific modules.
Fixed to pass tests.
Fixing tests to reflect reality.
"fixing" test (likely to be outdataed by diff branch)
Pointing to OpenACD fork of iconv.
Fixed most tests for queue_manager.
Don't crash if wxWidgets doesn't support the system locale.
Main window always shows toolbar again (Fix #265).
Should keep blank slate from appearing when all items are filtered by search.
Fixed theme definition for disabled sidebar open/close button.
Disable main window toolbar if setup assistant is visible.
Disable toolbar if game view controller is visible in main window.
Make sure a view controller does not become its own next responder.
Implemented new toolbar handling for OELibraryController that does not rely on the controller being in the responder chain.
Merge branch 'master' of github.com:OpenEmu/OpenEmu
Fixed last merge.
Make sure the last collection item is restored correctly on startup.
Really fix the bug while scaling options
[NimManager] fix typo for split.
ConvertToUnicode returns the number of wide characters including the NULL terminator.
Add -march=i686 for 32 bit builds as otherwise defaults to i386 which does not supply one of the intrinsics.
Merge pull request #862 from Osirium/pull/unicode-len

ConvertToUnicode returns the number of wide characters including the NUL...
Merge pull request #863 from Osirium/pull/build-32

Add -march=i686 for 32 bit builds as otherwise defaults to i386 which do...
libwinpr-crt: add extra null-terminator for ConvertFromUnicode.
Merge branch 'master' of git://github.com/FreeRDP/FreeRDP
Final changes
ppt and mp4
Update example
Update include
Make CSSClassApplierButton a toggle button
Update text alignment plugins
updated the horizontal rule button test and created a test for creating and removing a block quote
Added retina support for custom toggle switches
痛苦纠结我擦勒万劫不复rails抽风终于正常之避免组织成环, for #115
+ added basic forms for DB Connection setup
# Refactoring
Update delay 10ms -> 33ms

Because the bluetooth on read-write is very slow
Revert "[aml] fixed setting interlace under split gui/display and move interlace tag from refresh-rate to resolution where it belongs"

This reverts commit 6a8a76f49285440d9aea493ce3a58d0648c5a84c.
Revert "[aml] more split gui/display fixes"

This reverts commit b03896a92ccba090df937a45f1c36dea376e1c61.
Revert "[rpi] fixed to work with split gui/display"

This reverts commit 7bd7ee47cb6a75cb4ba283b0c569831631982439.
Revert "[aml] fix split gui/display"

This reverts commit 1dd89f3f9a95cd1169f550b18080638f7993e037.
Revert "[aml] added ability to split gui/display rez"

This reverts commit 4223350a2bc21a0cabd3f1cb0259b68f079e18cc.
add the ability to run a split gui/display resolution for embedded platforms
[aml] nuke non-working 480p res
Added support for color codes in messages
Update #PHP

Update to php library
Added mustache engine for templates
Init now loads the initial page through mustache php
Dynamic page content is handled by JavaScript and Node.js
debut estimation
loadIndex not for slots
Dired now uses the -h switch.
basic publishing for stolen points
add udftools
Merge branch 'master' of github:Ram-Z/PKGBUILDs
Update src/com/jordanneil23/SpawnMob/ConfigurationHandler.java

Typo kills everything
Firewall textures
don't know what this commit is about
removed extra documents
PliExtraInfo: Add info about PIDs
PliExtraInfo: Fix a tiny odd cosmetic typo
enigma2: update finish translation

by TimoJ
PliExtraInfo.py: Replace PMT PID by SID PID in dec for pidinfo
enigma2: update Swedish translation

by JanHJ
enigma2: update Hungarian translation

by robertut
Merge remote-tracking branch 'openpli/master'
Merge remote-tracking branch 'origin/master' into azbox
Sigma.Media.Control
abandona crud only api

ejemplo de un tester
Improve git/svn prompt
Color username + # for root
Brad patch to skip PDF report generation. Useful for testing
Added default option write_summary: false in order to not generate PDF reports by default
Merge pull request #212 from guillermo-carrasco/testing_patch

Thanks!

Brad patch to skip PDF report generation. Useful for testing.
Filesystem order is not consistent between Ubuntu and VM, changing to reverse alphabetical
Adding a home page to the project
Adding a home page to the project
lighten the background color
fix tabelle e bordo textarea
- Improved :VimFilerDouble.
- Fixed history.
Renamed Connections to ConnectionManager.
Changed some apis and added comments on public facing apis.
Added more documentation and generated xml files for some projects for intellisense.
Renamed Stringify to Serialize on IJsonSerializer interface.
Updated booksleeve version.
Build changes
 - Don't build docs for normal build
 - Fix build versioning
 - Delete build folder before build
forgot to remove the common stuff from the makefile too, doh
dodan komentar, funkcijo v models sm premaknu, in nova dva viewva za android API
Merge remote-tracking branch 'origin/staging' into staging
added study program
Merge remote-tracking branch 'origin/staging' into staging

Conflicts:
	estudentDjango/api/views.py
Merge branch 'staging' of git://github.com/Smotko/estudent into staging
Merge branch 'staging' of git://github.com/Smotko/estudent into staging
dodan "predmetnik"
Merge remote-tracking branch 'origin/staging' into staging
Bisic Font Builder Tool
removed mac-specific bindings
Added C-u binding
fix retry logic in read/copy
내그룹 수정 -> 패스워드 수정안되는 버그 수정
Exclude C++ headers. Prevents error with Decoder.h being inlcuded instead of decoder.h from code128.c during Pods target build
Removing previous symlinked ZBarSDKCopy since this no longer works with cocoapods 0.6
ZBarSDKCopy so we can use our fix before ZBarSDK fix gets merged into master repo
Update src/main/java/org/testng/ITestNGMethod.java
Added Javadoc to StormWeather class, Thread-safe methods, New exceptions, etc.

Signed-off-by: Xiaomao Chen <xiaomao5@live.com>
Start work on Rift loading algorithm.
Implement QuakeLoadEvent.
Start work on other quake events.
Explain Quake how to use new toys!
Improve the AI's cooldown logic a bit.
Merge branch 'master' of git://github.com/bobbens/naev
Merge branch 'master' of git://github.com/bobbens/naev
Consistent capitalisation of Station in names, and a few other minor fixes.
* Force land permission on completion of FLF base mission.
* Luadoc.
Merge branch 'master' of git://github.com/BTAxis/naev
Merge branch 'master' of https://github.com/perey/naev
Prevent cooldown from interfering with manual control.
Remove sseveral ssuperfluouss Ss and add them to this commit messsage.
Remove a few pilot flags and replace them with counters in the pilot struct.
* Reduced the input filter for description widgets.
Added pilot.weaponsetHeat(), for getting the mean and peak heat of a weapon set.
Implemented in C for performance reasons, due to being called fairly frequently by the AI.
Made the AI marginally heat-aware.
Badly-overheating AIs will cool down during combat as necessary.
AIs with turrets and cannons will switch between one type or both depending on heat.
Typo fix.
Merge branch 'master' of git://github.com/Deiz/naev
Merge branch 'master' of git://github.com/bobbens/naev
Active outfits should be disabled and not toggleable when a ship is disabled.
Prevent the AI from shooting during cooldown.
Fixed typo in filename.
Merge branch 'master' of git://github.com/Deiz/naev
Added .buggedquest command first test.
Fixed EZP-20012: Notice and incorrect behaviour of eZXMLTextType::title() method
Configuring Travis CI
Fixed #19401: custom tags attributes using mixed case error
Updating ezxhtmlxmloutput_regression.php with new rendering
Adding travis badge to README file
Not sure about 1:00 am or 12:00 am but just to make unit test success
README.txt -> README.md
Deleted blog controller
Added testAutoParagraph to the TextHelperTest

Implemented test for the textHelperTest
Klassendiagramm entwurf
Site updated at 2012-06-01 14:46:54 UTC
Check token type
Improving oauth
Failed attempt to modify request token
Version 0.41
Version 0.42
Version 0.43
Version 0.44
max2837 driver under construction
compilation comment from irc
changed to RFXF9503 balun on lowpass paths
selected 0603 footprint for L1 and L2, moved L3 and made DNP
max2837: remaining registers
Merge branch 'master' of git://github.com/mossmann/hackrf
max2837: extern additional functions, put test code in ifdef
Merge branch 'master' of git://github.com/mossmann/hackrf
Add error handling for call to GitHub API to retrieve contributors
Fixed some bugs (and probably introduced some new ones).
Cropping and Stretching implemented.
Fixed a faulty if statement in hva startup script
Merge branch 'master' into failure-recover-openvz
Added checks to openvz failure recovery script to make sure it doesn't try to start up instances that are already running.
Merge branch 'master' into failure-recover-openvz
Merge branch 'master' into failure-recover-openvz
Ported the failure recovery script to linux bridge and added support for images not in tar.gz format
Cleaned up dirty whitespace in dcmgr/configuration.rb
Cleaned up dirty whitespace in configurations/dcmgr.rb
Cleaned up dirty whitespace in dcmgr.conf.example
Cleaned up dirty whitespace in dcmgr.rb
Added validation to load balancer service type that selects ByHostNodeGroup mac address scheduler if no other is specified in dcmgr.conf
Isono bump version to v0.2.17.
add post-processing that is happen if AMQP server disconnected
before a commit is completed, check the connection of AMQP server.
added to display error message when amqp server connection failed.
Created a simple default mac address scheduler that always schedules the first mac address range in the database. std and lb service types now use this unless something else is defined in dcmgr.conf
change to local variable
Merge branch 'master' into mac_range_config_default
Improved the check for a mac address scheduler in dcmgr.conf
Merge branch 'master' into mac_range_config_default
Small modifications to config
Added Eclim 1.7.3
file system support started
alert check added to verification queries
posicionando nubes
PEVerify wrapper + verification step added
Fixed gitignore
changes in websockets listeners mechanism
updated gribVarMaps to remove duplicates.
nc4: enum types were not correctly handled (fix from dmh)
use org.itadaki for testing bzip2 compression, instead of apache compress.
Fix compiler errors
fix bugs: jenkins opuls test #3
fix one of the jenkins errors opuls #4
partial fix for jenkins #4
Fix compiler errors
undo debug output
fix jira bug TDS-356
use instanceof to figure out DapSort
Rebase conflict
Patch Group.java after rebase conflict
Fix compiler errors
partial fix for jenkins #4
rebase fixup
fix jira bug TDS-356
use instanceof to figure out DapSort
Rebase conflict
Patch Group.java after rebase conflict
Merge pull request #134 from VictorD/master

Small patch for what appears to be simple mistakes in VanillaPlayer
changed default font to fixedsys excelsior
added screen scaling feature (for "large pixels" style graphics)
masks now can handle bigger surfaces (up to 524288 pixels)
Merge branch 'master' of github.com:Vladar4/nimgame
I pulled all of the extras out of the ExampleControlProgram, and got to the meat of controlling movement.
I added an if-loop on line 49 that uses the toc(tic) function to turn the robot after 8seconds
Add brend, update product
version 4.69
Add taproot to manage history.
Added new methods that need to be finished.
The relation target will not longer be checked if it is a defined storage field.
New PHPDoc
added compile time definitions to setuptimers() to make only timers required get the interrupt vector assigned.  Also created pClearPTrainsTimer to clear out an individuals pTrains timer usually in the case of requiring a reloading of those parameters to the timer
Refactoring my code to work with jQuery.
Task F. add a dash of ajax
remove unused variable
AudioParser.cpp: indentation cosmetics
update ffmpeg (n0.8-14143-g4c5a9fd)
updated bootstrap, fixed window resize navbar padding bug, fixed enchantment count rounding error bug
adding ; endings. nothing else too important
Stop scripts changed to look for CIEL_ROOT in local mount point
- added a footnote-missing error message
Merge branch 'master' of github.com:abartov/ebydict

Conflicts:
	config/locales/he.yml
add tests for twisted version of plchandler
Changed instructor to full name in db, improved cache clearing, minor bug fixes
fix chroma view
Merge branch 'master' of github.com:acm-uiuc/liquid
remove reference to uid
add X.680.
Making better use of fluid api
Correctly validate keyspace access in create table statement

patch by slebresne; reviewed by jbellis for CASSANDRA-4296
Merge branch 'cassandra-1.1' into trunk
AutoSaving KeyCache and System load time improvements
patch by Vijay; reviewed by xedin and jbellis for CASSANDRA-3762
Add getsstables command to nodetool. Patch by Brandon Williams, reviewed by yukim for CASSANDRA-4199
Merge branch 'cassandra-1.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/ColumnFamilyStore.java
	src/java/org/apache/cassandra/io/sstable/SSTableReader.java
	src/java/org/apache/cassandra/tools/NodeCmd.java
Oversize integer in CQL throws NumberFormatException
patch by dbrosius reviewed by pyaskevich for CASSANDRA-4291
Merge branch 'cassandra-1.0' into cassandra-1.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql/QueryProcessor.java
Oversize integer in CQL throws NumberFormatException (support for cql3)
patch by dbrosius reviewed by pyaskevich for CASSANDRA-4291
Merge branch 'cassandra-1.1' into trunk
Minor correction in pig readme/example.
Patch by Fabian Rousseau, reviewed by brandonwilliams for CASSANDRA-4301
update host ID before token

Patch by eevans; reviewed by Brandon Williams for CASSANDRA-4300
Merge commit 'refs/top-bases/p/3881/00_snitch_topology' into p/3881/00_snitch_topology
Merge commit 'refs/top-bases/p/3881/01_calc_natural_endpoints' into p/3881/01_calc_natural_endpoints
Merge branch 'p/3881/01_calc_natural_endpoints' into refs/top-bases/p/4121/01_support_multiple_tokens_per_host
Merge commit 'refs/top-bases/p/4121/01_support_multiple_tokens_per_host' into p/4121/01_support_multiple_tokens_per_host
Merge branch 'p/4121/01_support_multiple_tokens_per_host' into refs/top-bases/p/4122/01_bootstrap_decommission
Merge commit 'refs/top-bases/p/4122/01_bootstrap_decommission' into p/4122/01_bootstrap_decommission

Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
Merge remote-tracking branch 'refs/remotes/acunu/top-bases/p/4122/01_bootstrap_decommission' into refs/top-bases/p/4122/01_bootstrap_decommission
Merge remote-tracking branch 'refs/remotes/acunu/p/3881/00_snitch_topology' into HEAD
Merge commit 'f664dd183facbadbf9c21ee61b7ea440c5be2a65' into p/3881/00_snitch_topology
fix nodetool output (from CASSANDRA-4429) that somehow got lost in a merge
Merge branch 'p/4125/01_admin_tools' into refs/top-bases/p/4127/01_migration_path
Merge commit 'refs/top-bases/p/4127/01_migration_path' into p/4127/01_migration_path
GUIDialogContentSettings: fill scrapers on each window init and not just on first one, save last selected scraper when deiniting
fixes #13351, thanks @dersphere for tracking it down
[pvr] fixed: disable pvr manager if we cannot start due to no add-on
[pvr] fixed: re-add missing string
fixed: meh, too tired
[pvr] fixed: don't blindly deref pointer

observed causing segfaults on exit, did not track down exactly how
jsonrpc: fix "type" being set to "movie" for non-movie items
[ios/osx] - enable LCD support like already available on the other linux platforms
PAPlayer: avoid division by zero in GetPercentage() for streams with no total time
[AE][SoftAE] Fix erroneous buffer duration calculations when transcoding
Merge pull request #1473 from huceke/raspberrypi2

[rbp/linux] changed move BitstreamConverter to a common location
settings: fix growing guisettings.xml caused by duplicate entries for resolutions
json-rpc: add new notification OnScanStarted for libraries
[rbp] fixed initial desktop resolution. read current resolution on windowing init and reuse it.
Merge pull request #1486 from FernetMenta/resolution

fix growing guisettings.xml caused by duplicate entries for resolutions
[ASS] - fixed display of time overlapping ass subs
Merge pull request #1491 from Memphiz/asssubs

[ASS] - fixed display of time overlapping ass subs
Merge pull request #1456 from fetzerch/bugfix-pvr-recordingtitle

[pvr] Use correct title for recordings (if available)
Merge pull request #1463 from avdleeuw/ticket13347

[PVR] Changes to make PVR Groupmanager able to deal with groups again
Merge pull request #1424 from BluTuTh/patch-4

[PVR] Fixes no focus on Find similar programme
Merge pull request #1306 from koying/cecsetup

[cec] Assign the "Setup menu" button to "Title", i.e. context menu
move deploy script to the scripts directory
removed edgelists folder, not really part of project
Added English-language exporter
Updated English translation and fixed a cookie storage bug
Added an example se script which exercises all Selenium 2 commands; also prettified some English output
changed db context for appservices
Remove unused plugins
Homebrew で NPM を入れるので Homebrew のパスを解決する
Fix pony mail for donator
New MySQL realtime database
moving everything to separate git repos.
fix links
Merge remote-tracking branch 'origin/ui' into ui
fix urls
Merge remote-tracking branch 'origin/ui' into ui
fix urls
Merge remote-tracking branch 'origin/ui' into ui
Try to fix RMagick specs fopr JRuby
备份母体背景
桌布更新
衣带渐宽终不悔
适应性调整
停车坐爱枫林晚
区分CPP武将和LUA武将
(⊙v⊙)嗯？你要干什么？
我上一次写LUA是。。五月份吧。。

Signed-off-by: cyclone <gcyclone@gmail.com>
roll back to my version for consistency
圭全竜の駒名に対応したのとリファクタリング
ut: move fixtures to testsys.c
ut: test Goal.
py: do not accept any parameters in repo creation.

People think they are used and it confuses them.
changing pkgs again
Updated to latest translations from Transifex.
Updated French translation.

This update was sent by email rather than updated on Transifex.
Merge branch 'transifex'
Updated ready for release as 0.6.3.
updates to remove codehaus.jackson; add external payment id to paymentInfo; change entitlement_events table to subscription_events
[maven-release-plugin] prepare release killbill-0.1.12
[maven-release-plugin] prepare for next development iteration
updated tag and custom field api for killbill 1.0
Merge branch 'master' into integration

Conflicts:
	analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java
	api/src/main/java/com/ning/billing/payment/api/Either.java
	api/src/main/java/com/ning/billing/payment/api/PaymentInfoEvent.java
	overdue/src/main/java/com/ning/billing/overdue/api/DefaultOverdueUserApi.java
	payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentInfoEvent.java
	payment/src/main/java/com/ning/billing/payment/dao/PaymentSqlDao.java
	payment/src/main/resources/com/ning/billing/payment/dao/PaymentSqlDao.sql.stg
	payment/src/test/java/com/ning/billing/payment/api/TestEventJson.java
	payment/src/test/java/com/ning/billing/payment/provider/MockPaymentProviderPlugin.java
Merge branch 'integration' into server

Conflicts:
	jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleJsonNoSubscriptions.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/resources/AccountResource.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/resources/InvoiceResource.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/resources/PaymentResource.java
	payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentInfoEvent.java
	server/src/test/java/com/ning/billing/jaxrs/TestAccount.java
	server/src/test/java/com/ning/billing/jaxrs/TestInvoice.java
Merge
added scoring, added top scores, added city bonus
scala-shifter, new version 0.2.1
Removed unneeded defensive copy
Fix for bug which caused duplicate permalinks to be generated under some conditions
Trie와Code 수정중...Trie를거쳐서나온값중에index_end와 index_key만맞고, 나머지는다틀린상태
Better Sync description.
Update doc/fr/api/events.markdown

updated events.markdown in french
Renamed AmpEnv to EnvFollow and altered Effects.h accordingly.
Changed AmpEnv to EnvFollower and altered Effects.h accordingly.
Renamed Delays to Multitap.
[BUG] Corrige pequeno erro de markdown no post n.2
creation of the RDF graph
Data streams replace ajax to create a more favorable API.
RedirectRoutes can now be created with a 301 status and a location header
failing tests to make sure redirect and location go together...
adding validation so that only redirect routes have a location
a location for a redirect should not be an empty string
Revert forking of asset_host.

This is no longer necessary as we are using inline data-uri's for the fonts (IE8 excepted, and IE8 doesn't need CORS headers).

Additionally this never really worked, because when the fonts are served through the asset pipeline they don't have a path prefix of /fonts
Delete a duplicate and incorrect width
Configure action_mailer to use ses

This allows seception_notifier to work.
Merge remote-tracking branch 'origin/10_shades_of_grey'

Conflicts:
	app/assets/stylesheets/core.scss
Merge pull request #103 from alphagov/width-fix

Delete a duplicate and incorrect width
Some fixes for variations of tabs across devices
Merge branch 'master' of github.com:alphagov/static into search-mobile-changes

Conflicts:
	app/assets/stylesheets/core.scss
Remove legacy google analytics tracking

The legacy codes were listed by Ashraf Chohan and are:
Citizen-Format-Guide
Citizen-Format-Answer
Citizen-Format-Benefit
Citizen-Format-Service
Citizen-Format-Localservice
Citizen-Feedback
Citizen-Format-Findmynearest
Citizen-Accessibility
Merge pull request #11 from alphagov/remove-legacy-tracking

Remove legacy google analytics tracking
Stop the related box from scrolling on the footer
Reinstate the related box fixer where port is shorter than related height
Moved the overflow fixer into the main related box script
Merge remote-tracking branch 'origin/edd-stop-sidebar'
Only include the header and footer once
new file
Merge branch 'master' of https://github.com/amaret/BlinkOne
Partikelbewegung nicht als normalisierter Vektor
http://amhnews.github.com/amhnews/googlea43f17047a835917.html
<meta name="google-site-verification" content="0_L6Lfg-rzP1pL8_3tMs3Oq3_bqq8KktVc1pnPHGBSI" />
Fully synced readback-display implementation (GH-11)
Additional sync mode with display lagging behind by one frame (GH-11)
Added option to change the queue size
Paint company area on blueprint
change agent to be a war file
compact form layout
set build result
start settings
Initial attributes tests
Attribute writers accept {} to represent null record
make policy only be required if state is not disabled
Merge pull request #1388 from goozbach/selinux_bugs

make policy only be required if state is not disabled
Template using module_vars early

Since no basedir is available at that time, avoid invoking
lookup plugins since they assume it is present.
Merge pull request #1604 from dhozac/consume-module_vars-early

Template using module_vars early
Removed one huge bug
1/6 loo quality on train2.csv
Merge
For the build of batik-all-flex.jar, remove requirement to exec svn and fix up MANIFEST.MF for batik-all-flex.jar.

git-svn-id: https://svn.apache.org/repos/asf/incubator/flex/sdk/branches/release4.9@1423479 13f79535-47bb-0310-9956-ffa450edef68
Closes github issue #1 (https://github.com/apeiros/chronos/issues/1).
SAKIII-5507 Fixing whitespace issues in Related Content JS
https://jira.sakaiproject.org/browse/SAKIII-5507
dump dumb 2 FIX

Signed-off-by: Anton Arapov <anton@redhat.com>
Fix: removed a duplicate file
Fix: change build to create
Add: role factories
Add: admin_user and manager_user ro factories
Add: add an admin dashboard
Added pry-me.
#10 hecho merge del pull request
Implement signals instead of events and listeners

Replace events and listeners by implementing signals from the sigc++ library
Change variable datatype to Float from Double and clean up functions

- Change all Double variables to Float type to avoid casting

- Remove function updateFps as it is no longer required
[enh]proxy support added to fetching feeds
[fix]fix malformed html from feed description
Merge pull request #8 from misnyo/master

[enh]proxy support added to fetching feeds
Use preprocessor instead typedef. It confuses some compilers
Use env class
More 'closed' checks
add the full mem dump and reading from file
title the author name
increase font size in input fields
Refactor seque showDetail to showSearch

Default generated seque identifier was poorly named
for the view controller to transition to.
oppai boin boin
oppai
rough draft up
Fix Method interface
Fix bug with date selection.
added convolve_fft, a counterpart to convolve.py
changed convolve_fft's function name from convolvend to convolve_fft
implemented mdboom's suggested changes (mostly docs, but one error != vs
==)
print -> warnings
np.ma.is_masked now used
pep8 compliance.  I didn't finish it, though. There was an 82 character
line that really just got ugly if you shortened it more, and I don't
believe in having spaces around a**x - it's one term!  well, perhaps
I'll do that later...
linesizes <= 80
pep compliance revoked; one of the "compliant" statements resulted in a
syntax error.  How do you split a for loop's arguments onto two lines?
am I going to have to declare the iterators separately?
tried to make the documentation fit the astropy standard, but it doesn't build right on my machine...
debugging statements added to convolve_fft and a lot of little bug fixes
added test_convolve_fft (in progress)
Changes that were copied to other computer and added there (needed to
commit to merge, I guess?)
convolve_fft now has self-consistent behavior that is well-tested in
test_convolve_fft (needs to be added) but NOT consistent with convolve!
(for good reason - there are some things I don't think should be
implemented in fft... or maybe I'm just too lazy to think up how they
can be done)
added convolve_fft tests
removed edits to convolve.py - they were never supposed to happen
Finally got tests to pass.
KNOWN BUG: 'boxcar' kernels with even sizes (e.g., [[1,1],[1,1]]) do NOT
behave the same in convolve and convolve_fft, and frankly I'm not sure
which is right.
test_convolve_speeds now makes sense: before, was using the "None"
default, which just sets everything to zero for the kernel sizes I was
testing.
__init__ updated to include make_kernel & convolve_fft
added my results as a comment in test_convolve_speeds
removed debug statements from convolve_fft
documentation cleanup & addition
(note that the last few commits have violated pep8 in a few minor ways;
I think these enhance readability but am open to criticism)
Fixed docstring issues @eteq pointed out
Quizy tekstowe (5 łatwych, 5 średnich)
Add global pixelation effect to Tutorial 5
More comments and clean-up on Tutorial 4
Refactoring.
Merge branch 'master' of github.com:auREAX/metroirc

Conflicts:
	MetroIRC/src/moe/lolis/metroirc/ChannelActivity.java
	MetroIRC/src/moe/lolis/metroirc/backend/IRCService.java
	MetroIRC/src/moe/lolis/metroirc/irc/CommandInterpreter.java
Add new icons to items currently using blank documents. Update icons for some items.
http://forums.zotero.org/discussion/8544/icon-for-presentation-icon-for-document/#Item_9
Add attribution for Fugue Icons.
Items Icons http://forums.zotero.org/discussion/8544/icon-for-presentation-icon-for-document/
Don't show exceptions multiple times
Fix indentation and IE parse error
Don't create missing attachments if files are missing on import
Fix bubbling errors in connectors under certain circumstances
Start processUpdatedXML() inline to avoid wait level errors (hopefully)
Remove appscript from about box
Fix indentation and parse error
Fix file syncing link in prefs
Clarify about.xul (icons) and delete TODO comment (cachedTypes.js)
Merge remote-tracking branch 'gracile-fr/3.0icons' into 3.0
Just focus libraries pane on shortcut key

Closes #133
Remove localizers from About pane, in favor of webpage
Unescape HTML properly in IE
Fix unescape for blank strings
Replace double spaces by a single space, to make behavior more uniform with nsIScriptableUnescapeHTML
Don't fail with error when item.note is missing
Create a node in a DOM document and use it to implement the same unescape technique in Firefox as we currently use in the connectors. This may cause some data mismatches initially.
Don't allow periods and commas at the end of DOIs
Perform detect web before calling Google Scholar translator
Require at least 4 digits for the prefix
Merge pull request #92 from aurimasv/cleanDOI

[cleanDOI] Don't allow periods or commas at the end of DOIs
Move _detectWeb to Zotero.Translate.Web.prototype
Remove unimplemented and unnecessary callback argument from safeTranslator.getTranslators(). Translators calling getTranslators() can/should use setHandler("translators", ...).
Use getTranslators to perform detectWeb with a set translator.
Fix a document update error. Explanation is given in the code.
Allow running detect with multiple translators set.
Server-side translation and attachment upload, part 1
this.translator may contain Zotero.Translate objects or translatorID's
Moving setHandler "translator" next to other setHandler calls.
Merge pull request #93 from aurimasv/recognizePDF

[PDF Metadata Retrieval] Call detectWeb before trying to call doWeb for Google Scholar
file system fix
Merge branch 'master' of https://github.com/austiniam/GPLib
mac filesystem fix
Merge branch 'master' of https://github.com/austiniam/GPLib
Deselect a planet that gets taken over by an enemy.
Prevent turrets from charging up multiple shots.
Cleaned up DcNetwork and Network 'to_api_document' results.
Added '/networks/:id/services' API call.
Added POST '/network/:id/services' api call for adding network services.
Handle ico mimetype
Fix compilation error
Mode and theme selection are working again in the options tab. Remove unused html fragments which used to be Mojo templates
M-c -> compile
#169 added new field to contract dateDecision
ignored stuff

git-svn-id: https://libgdx.googlecode.com/svn/trunk@3763 6c4fd544-2939-11df-bb46-9574ba5d0bfa
美化了‘查看学习进度’功能
Fix page title and add description meta tag
Fix missing quilt
TourMap
Erm. ROOT missing
css fix to make text wrap in code blocks in firefox
Merging 1.2, EDS docs, and other edits into publish branch
Merge branch 'master' into publish
Merge branch 'master' into publish
Merge branch 'master' into publish
Merge branch 'master' into publish
Merge branch 'master' into publish
Merge branch 'master' into publish
Merge branch 'master' into publish
Merge branch 'master' into publish
Merge branch 'master' into publish
Merge branch 'master' into publish
Merge branch 'master' into publish
Merge branch 'master' into publish
Merge branch 'master' into publish
Merge branch 'master' into publish
Merge branch 'master' into publish
Merge branch 'master' into publish
Merge branch 'master' into publish
Merge branch 'master' into publish
converting to centralized templates
[homescreen][lockscreen] px to rem
[system | statusbar] px to rem
[system | utility tray, statusbar, apps wrapper] px to rem
[communications | dialer] missed tag
[browser] px to rem
[building blocks] px to rem
[comms | sms] px to rem
[costcontrol | system] value selector px to rem
[system] px to rem
[Make] Added SCREEN_TYPE
Frozen version 12/12/2012-11:33 => Twist: bcbd53fcf48849b0e168f6de4194ec628ad01e2c Nighlty: bdae7cfb1925b69d77ff5ece14ea569e2e77e22e
Bug fix for auth_capibilities variable definition
removed pitchshifter~in favour of pitchshift~
Fixed bugs in the installer:

- Bytecompilation run twice
- Bash style string concat that doesn't work with sh.
- Default path was \$HOME instead of the users homedir ('' vs "").
Removed the savefile dir.
Don't hide the output of `mkdir`.
Check if prelude is installed before anything else.
Remove the broken usage message.
Merge pull request #189 from fbs/new-installer

Installer updates.
Admin page can now delete database entries.
Scanning Layout Change
Merge remote-tracking branch 'origin'
completed ver 0.9
flatten error list
Agregar página de panel de administrador, página de ranking (para seleccionar cual desea ver), y ranking de sudoku y trivia.
Added RetLib and MovieManagerLib for ReturnApplications
resized clipoard css area and added cloudmine sdk
HTML entity for ă
Genericized.
Updating header with license info, updating sample usage, cleaning up white space (all tabs)
Fix: Need a new group before possible to realize a new virtual user.
Removed import of non existing sub directory (removed - not in use).
Add a static route to our internal sub domain.
Forget the maildir create script - try to get procmail to do the work.
Renaming parser.js to fix broken eval in chrono.js
Merge pull request #3 from shawnsi/master

parser.js incorrectly named
Simplify `_.size`.
FileMuller
relocate method "set_srand_null();" to "int main()"
add function "void set_srand_null()"
clean "int alea_rtd()"  and "int get_random_integer(int, int)"
rename "int random_integer(...)" to "int get_random_integer(int min, int max);"
add "void set_srand_null();"
annotations about program execution
update function names
clarify functions names
Compile G++
syscalls: C++ify
ringbuffer: Initial commit
feedback: Implement PSD/stage feedback modes
Merge branch `stacked` into `master`.
Add sizes to build.

Add sizes utility from Timezone. Display minified size during tests so
that they show up in Travis CI output.
Merge branch `build` into `travis-ci`.
Re-add image alignment functionality from classic theme
Re-add image shadowbox from classic theme
Tweak border size for shadowboxed images
Add theme/tool attribution in footer
Missed static function - e_strict compliance
Index key is too big for Firebird. Need to create a shorter field for indexing
but have just disabled for the moment - needs a cleaner fix, but it allows dumb
install short term.
Added a Prompt Overview section to the README.
Fix load_results to work with new config files.
sm3
sm3_1
last test
Merge branch 'master' of github.com:boazadato/smtry
removed common
Add attribution of method effect perms
adding solr to the search stack.
Introduced 1,2 and 3 column layouts.
Image::show layout changes to single-column.
Breadcrumbs added to Image:show.
Report comment as SPAM.
init content added
Removing plt dir
Work around for missing __attribute((alias))

Some platforms such as OSX 10.7 don't have __attribute((alias)) enabled.
We need a work around there
Added codeVersion, LastScanOK , and Pingable attributes to the server
class.  This also changed to serverDB and addServer
Merge remote-tracking branch 'origin/master'
1.后台同步任务,单条校验失败继续同步,主要针对会有重复jira_id的情况.
1.分页数量从10调整到30.
1.小组任务状态显示增加高亮颜色.
1.manager修改任务时小组选择和组员下拉框联动;
2.修复manager修改任务时有group_id错误的问题;
3.修改更新记录后,评分路径错误.
1.小组任务增加评分显示.
Merge branch 'hotfixes' into dev
1.小组任务查询结果按照member_id,id排序.
1.小组任务查询增加评分过滤.
1.评分后更新单条记录增加评分列.
1.gemfile 增加rake和whenever.
1.增加whenever配置文件;
2.发布文件中增加whenever执行.
Merge branch 'feature' into dev
1.增加animate css.
1.增加任务到达结束日期后状态变成"延期"的rake任务及whenever定时.
1.当任务是"完成"状态后,去掉修改任务按钮.
Merge branch 'feature' into dev
1.增加install new gem.
Merge branch 'feature' into dev
1.去掉上次的根新.
1.更新whenever到0.7.3.
card alignment squeezes rows together, attachment cleaned up
- the vertical spacing between creature/land/suspend rows now changes depending on the largest stack of attachments on a card
- minor cleanups to the attachment scripts, nothing noticeable in gameplay
try to solve problem with hisory.js
correctly handling [array, retval] parameters, and giving a better
type for outparam arguments
improving the error message to be *slightly* more informative
When trying to deref a TRegex, support automatically treating the type
as a String instead.  Arguably this should not be part of \JS, but
part of the desugaring process, but for expedience I'm doing it here instead.
fixing odd behavior in typ_subst for TWith -- apparently I'd tried
both ways and hadn't convinced myself which was right; I'm switching
it so that I can write a type like typlambda t :: * . {Ext with value
: 't} and have it work without errors.  This change does not break any
previously-working extensions...
improvements to the environment, and removing now-redundant
annotations for ext1964.  Most of the remaining cheats are because we
don't model the document or window objects as nsIDOM* objects; that
involves annoying tradeoffs.
Revert "Revert "New feature product.""

This reverts commit 7a93c78d602a65aa832ab3873bd6096ba1dc7281.
Revert "Revert "Revert "New feature product."""

This reverts commit 4110bcb3b6e89e13891d045a361f12eea63fedaa.
Revert "Revert "Revert "Refine APP:"""

This reverts commit 60b3717e5a28db061db9f2ee46ae91cb2b634213.
Revert "Revert "Refine APP:""

This reverts commit ff9bf815be02d3d0b821c536dd334f0fb20f1e56.
Revert "Revert "New feature product.""

This reverts commit 07235ab63dc165e547813b9f19f6cb11a5c63814.
add realboost
added autowrite and autochdir; added more latex surround mappings
Adding descriptions for templates/ and tools/
Revert "Don't use /usr/bin/env."

This reverts commit 790ad8c1ecf28fb37ac8e0ac654cecedc8b88eaa.

No, we are not going to hardcode /usr/bin/perl, as this will break things for at least one major user of Bucardo. If the -w is the problem, remove that, but keep /usr/bin/env please.
Allow --no-debug and document --debug.
Set use read operation to false. Not a good idea