labofsahil/github-event-dataset-2012 huggingface dataset:
retirando config do jetty 7 até migrar o servidor, games não são mais injetados (deu um conflito estranho), deployManual modificado para não rodar o sbt
buffer overflow edited
Merge branch 'master' of github.com:vikig/pareport

Conflicts:
	pa_report.toc
subtraction issue fixed
interval analysis addition fixed, removed weird X thing
pyrt: various fixes, changed type of the 'trans' input in the ratran class to string.
pyrt: trans input is now stripped of whitespace, RATRAN does not tolerate whitespace
Download the 64 bits version of xulrunner for 64 bits arch
Moving Duration DSL to a separate package.

Reverting to Java 6 time units.

Review by: @phaller
modified:   sort/selection.h
	new file:   sort/sort_test
	deleted:    trees/main.c
Overhaul some scripts
use function pointers to generatize operations
name and desc should be copied to avoid corruption
generalize printing devices
add support to enumerate and operate on sources
make the list action output sources too
add [Muted] to muted devices when printing
add is-muted action
add defaults action and make it default

The `defaults` action lists the default sink and source while `list`
lists everything. This action makes more sense as a default action.
replace set-sink with a generalized set-default

Have one operation that can set both the default source and sink based
on context.

pulsemix --sink set-default 0
pulsemix --source set-default 0
add actions to set and get balance
Refactor LICENSE into its own documentation module. Yep.
training_data/README.pod formatting
Sha-1 GUID library
Logging http.Handler
only index active events
fix contact sub-types being lost when submitting a participant profile
Streamline less compilation in dev

Due to filesystem limitations on nodester etc, can't write compiled
css to disk on startup. So I'll continue to check in generated
css for now. At least less-middleware streamlines development
Less mystery solved: including blank less file causes following to be excluded
simpler vundle
some documentation updates. this addresses #518
some documentation updates. this addresses #518
added reference to link to filtering section

was about to write the text for issue #501, but it's already done. this closes issue #501.
modified version-specific text

this addresses issue #502, but #535 must still be addressed.
Merge branch 'doc-updates' of github.com:gregcaporaso/qiime into doc-updates
added contributing to qiime document

this pulls a lot of text from the recently-updated "Reporting and fixing bugs" document, but is generalized to new features, documentation edits, etc. The "Reporting and fixing bugs" now refers to this one for all of the technical details regarding bug fix submission. this closes issue #454.
Added new script load_remote_mapping_file.py which can download and save a mapping file stored in a Google Spreadsheet. Still needs unit tests added and a tutorial, plus a few more features.
Added some initial tests and the ability to extract a key from a google doc url.
Added support for duplicate 'sanitized' headers and comments; added more tests.
Added accompanying tutorial for working with remote mapping files.
Added more rigorous testing of URL parsing.
Split main loading function into many smaller functions, added comments, renamed some functions.
Added more error checking, more unit tests, usage examples, and fixed bug dealing with duplicate headers.
Added subsection regarding troubleshooting custom RDP retraining files
several updates based on pull request feedback

also expanded discussion in a few places.
various edits while proof-reading.
updates to parallel qiime document (#338)

this was very out-dated...
edits while proof-reading
added note on failure recovery

this should address #338
Modified rdp retraining tutorial section to incorporate Greg's suggested changes.
blog.loopx.cn
Introduction and install guide included.
deathcause: show more info for non histfigs
follow df-structure rename unit.unknown8 + able_stand_*
ruby: fix onupdate tick limiting + advmode, add pageprotect, add :script_finished
scripts/devel/create-items.rb
Merge branch 'master' of git://github.com/jjyg/dfhack
fixed error in process_name
don't keep bundle directory in repo.
update component details when you select a component, add component
details to component jsons
Fix a collision between view/model names with olapSelector component
Fix some more collisions between view/model names with olapSelector component
Yet another fix of some more collisions between view/model names with olapSelector component.
Fixed bugs with NewSelector component.
Fix some event leaking in NewSelector
Fix some variable scoping
Fix some namespacing
Deleted comma that was causing IE8 to break
Make NewSelector hide ViewManager when openened
Simplify choose file button
rphp rename corvus
Add zsh syntax highlighting and substring search plugins
Add Tom's theme
Checking that data images work as expected when not local
Intro character animation working
Merge remote-tracking branch 'origin/Superhero-2012' into Superhero-2012
ignores
moving main to __main__
adding setup.py
more on the deadlock

Signed-off-by: Dominik Dingel <wodar@Morley-Dotes.local>
(OK) resolve namespace issues
add systemtap package for archlinux
Everythings is so abstract that even RpcRunner dosnt need to extend System anymore :-)
File.pathSeparator
re tweak
 normalize by removing punctuation, generate html report of matches for review
clearer given when then pattern
ログイン周りを実装
footer & titile fixed
YD: Added first draft of MySQL database driver
Filename
Merge branch 'master' of github.com:yefim323/DBIDE

Conflicts:
	public/stylesheets/style.css
	views/header.erb
Merge branch 'master' of github.com:yefim323/DBIDE
wrote a working version of vector add on the gpu. Both CPU and GPU versions take sub seconds so it's hard to justify the use of GPU. And GPU load/unload to mem takes couple subsecs longer than cpu. However, quite proud that my program runs on parallel on the gpu (~512 work items, each of 2411 adds)
support unit-test in nodejs
another attempt to ensure cane only runs where it's supported
Moved tests and Makefile to subdir + split json tests in separate file
added configuration file parser for classic scheduler
modified cookbook name
grouplist,userlist,maildel added.
treat "ng" as valid pin-yin
remove buffer limit in autoeng, add option for action on space/select candidate word (not used yet)
words limit
spell cb return irv
select candidate word in auto-eng
Merge branch 'master' of https://github.com/fcitx/fcitx
Revert "change the position of this new config option"

This reverts commit d88b404e44e872e759ef30fa5170c5844031cf4d.
move everything to switchbyindex
Merge branch 'master' of https://github.com/fcitx/fcitx
let's back to vertical though..
[xim] init xevent with initilizer list (so all uninitilized members are set to 0)
[pinyin-enhance] only enable stroke input for pinyin (not shuangpin) input methods
[cmake] fix for py_stroke.mb, [pinyin-enhance] only load stroke dict from system dir
[spell] move dict
[cmake] less warning
[pinyin-enhance] fcitx_utils_get_fcitx_path_with_filename
[pinyin-enhance-stroke] more complicated rules to determine where the stroke candidate words should be inserted...................
[xkb] fix memleak for XkbRF_GetNameProp, making xkb->default*s always valid after init (although they might be empty)
[xkb] format changes splited from previous commit
Made debian package
Рендер игровой сетки
Updated plugins.
Updated css/sass/scss plugins.
admin bugfix
major bugfix
Text changes
Updated prices page
move to outside interceptor
add remove-dir and undo
Added a remote
Updated
WINKSTART-948: Add Landing Page
layout.css: Schriftfarbe der bookUrls geaendert
Merge branch 'master' of https://github.com/2quader/webBkmx
overlay_style
Update to use rails 3.2.6. Brakeman report (brakeman -o report.html
rename Jnuer to SchoolInfo
Added sorting function to students view
gitignore emacs backup files, add page.sourcetitle
redis save
Fixed the $stdDev operator so that it now works in a shared environment
Filters ok, tweets donwloaded and stored in tweetsknox
Merge branch 'master' of github.com:Akrome/cs424-p4
Colors fixed
proxy plugin: increased default timeout to 20 seconds
RPC::Server::Instance#spawn: now raises exception on invalid spawn count
Merge branch 'experimental' into no-webui
Framework: Updated revision
Plein d'avancées =D
Changement de nom de Edgedistances.c/h... A virer vu que c'est inutile ?
En dehors de ça, viré edge.c (inutile). Sinon, ajout de entree : une entree pour tester tsp sur toutes les villes du petit exemple.
11.09 17.50
slight lua documentation
Thought I already did this.. Implements the SixHourFix and initializes the variables for Smart_CurrentClient variable.
Fixed a lot of things. Does not work
Bigsam:
- Fixed stash -1 position bug.
- Fixed shield skills bug.
- Improved the warehouse list open command
Castiel:
- changed the player.save(), that we can see the errors if it fails
- Changed pet breed time to 20h
- removed output on BasicAttack
- fixed Markmanship, BugsummonSkill / Beastsummonskill, AxeMastery, SwordMastery, OverheadBlow, WirlwindSlash, Semi Automatic Skill
a
Merge branch 'b2' into nb

Conflicts:
	a.txt
111
grossemaj
added: new support on 3-digit hex color code

  added: new support on "optimized" coordinate expression
  added: new support on opacity in <g>
Added XBImageFilters.podspec
Fixed podspec..
Fixing paths..
Changed version to 1.0.0
Fix fix fix.. thanks Francis Chong for pointing that out.
Fix fix fix.. thanks Francis Chong for pointing that out. Again.
Changed source url protocol to git
Merge pull request #188 from xissburg/master

Added XBImageFilters
[Update] BHTabBar (1.0.0)
[Fix] TouchDB.
iOS-Color-Picker 0.0.6
Merge commit '153741982a0e1e602c1f52b0777888b351ae3f94'
Merge pull request #617 from fcanas/master

iOS-Color-Picker 0.0.6
added DDGoogleAnalytics-OSX.podspec

Signed-off-by: Dominik Pich <Dominik@pich.info>
tagged googleAnalytics

Signed-off-by: Dominik Pich <Dominik@pich.info>
Merge pull request #680 from Daij-Djan/DDGoogleAnalytics-OSX.podspec

Dd google analytics osx.podspec
Adding New API and Updated Version  to v1.0.2
Fix for back/forward buttons
Fixed merge
Fixed the overhang error. Also noting that the new slight-repeat protection spec does ease up the gameplay.
joala, #27 Vararg references are not logged

Refactor test to fix static code analysis reports.
joala, #27 Vararg references are not logged

Refactor test to fix static code analysis reports.
joala, #27 Vararg references are not logged

Slight fixes.
joala, #27 Vararg references are not logged

Fixes #27.
Fixed ArgumentException to display the message specified instead of the default one
* Fixed checkEmailAddress in SecUtil class to return the argument name in error
* Email can now be changed for existing instances of MembershipUser class
Added DEMO
Fixed ActivityNotFoundException which occured when starting SettingsActivity
fix ledger class creation
try image in README

Signed-off-by: Erik Bernoth <erik.bernoth@googlemail.com>
BUGFIX: parenthesis order in setExecutionEnv()
Added Kicking and Banning Ability
Fixing user signup issue...
Fix, add in default config values, add in proper whitelisting.
Fix layout in the request details
Print error in the request form
Move all the templates for a request inside dps/demande

The templates were also renamed:
 * (.)*nouveau.html: to add or modify an object
 * (.)*resume.html: display an object details
Improve again the request summary using dt/dd
Unify the design with the request summary
Fix wrong link from the dimensionnement summary
Demande: add a letter icon for the email
Don't count free serializations in $level
This is a saner default. Just in case our DB schema is very complex.
This'll make debugging a little easier. Still not really the way to go
...
Comply with coding standards (sortof)
Content-type -> Content-Type.
Shouldn't matter per RFC. But it looks like some clients are alergic to
this.
Corregido error de gravatar
Removed bad auto-install code, let users do that themselves
Fix unit test broken when we updated the MAC vendor prefix file
Add a couple of misc comments about what functions do
Fix incorrect malloc size for dhcp_queue and unitialized m_count value

sizeof dhcp_queue was giving the size of the pointer, a rather small value
that oddly worked fine most of the time but in some causes would 

Fixes #40
SCRIPTS: Make the win32 win server 404 more generic

Fixes #41
Merge branch 'integration' of git://github.com/DataSoft/Honeyd into integration
Allow interfaces even if they don't have an IP address set

Keep an eye out for unwanted side effects from this.

Fixes #14
net channels: multi-part messages replaced with multiple messages.
"debug" channel excluded from the overall etag
issue #64. net reader/writer rewritten. changes in channel descriptor
a new sample added. small fix in zvm api
UT/BF: Fix return value of get_move to include the say string.
Added a test for LIST (currently failing "as expected")
Add tests for the escape_label option
Incluido funcion de nuevo proyecto

Nuevo proyecto y su area de direccion asociada
up feat views taxo product : remove picture field from left menu displays
ADDED
+Navigatiebar updaten (imageSpriteButtons)
+ButtonClass added

TODO
+timeline + thumbnail in aparte klasse
+fix hover timeline
+TOC
+multiple ibooks
+template 0 (frontpage)
Added a properties file which should contain x-file info and volatile info
Started using the properties file. Added js docs
updated the login interface
Gagner
Test d'un socket

qui ne fonctionne pas
Mapa en contactenos y actualizacion de errores en css

mejoras css y se añadio mapa a la seccion de contactenos
Přidán export formuláře pro zadávání výsledků.
Přidán nadpis stránky.
Přidány volné řádky do exportu.
Přidáno blokování automatického načítání do PHPExcel knihovny.
Otevřena verze 1.0.2-dev.
Merge branch 'excel-export'
Vydána verze 1.0.2-rc1.
Nastaveno výchozí chování hledání duplicitních družstev při srovnání celkového pořadí.
Opraven export Excelové tabulky.
Drobné opravy.
Vydána verze 1.0.2.
Will be refactoring the wrapper code such that it is not specific for web services but for any object
Moved validate_pdf to custom.validators
Fixed stupid Schoolr references stupid name fucks.
Fixed some urls to accept digits for usernames.
Nearly finished infoweb fetcher, works now!
Transforme le tuple3 en object Endpoint
Extrait les infos providers (vue) dans un objet Service
databaze a content provider
Fixes for Monks
playing with git
Merge branch 'master' of github.com:GOFIRST/scratch

Conflicts:
	README.md
Merge branch 'forward_mercator_handle_bad_values' of github.com:opengeo/geonode
Add Documents as internal app
block main to body
Merge branch 'dev' into documents_internal
fix imports
Fix test and url cleanup
Merge pull request #528 from simod/documents_internal

Make Documents app internal
Merge remote-tracking branch 'upstream/master'
Update currentversion.xml
Merge pull request #345 from Gravecorp/master

Fixed issue #344
Merge pull request #347 from Gravecorp/master

nsis plugin update
Merge pull request #348 from Gravecorp/master

update getvc.nsh
Updated updater link
Merge branch 'master' of github.com:kellyelton/OCTGN

Conflicts:
	currentversion.xml
Merge remote-tracking branch 'upstream/master'
Update installer/GetVC.nsh
Fixed #329
Updated Changelog
Fixed #355
Update installer/GetVC.nsh
Fixed changelog formatting problem
Merge branch 'master' of github.com:kellyelton/OCTGN
3.0.1.2
3.0.1.2
Merge remote-tracking branch 'upstream/master'
Partial working External Fonts
Finished support for custom fonts
Nobody is admin
Added quiet_assets gem

Removes assets request notifications from development logger
styling
titles
styling
Done issue #34
New vim configuration, inspired by Yadr
Added Post.cfc
Added README to Goertzel
Fixed typo

Will sync all the new stuff in the near future
changes from as3/hv/core
Fixed Chests
Fixed Chests
added terrain, city and unit creation
Minor grammatical change to README :^)
Style issues has been fixed.
Add mapred-site to support multiple mappers
Add Additional Test cases to support multiple streams, Multiple Mappers
Half-working version
A new way of handeling the playlist

Removed the old _underscore way that I used temporarily. Now the
playlist updates if the innerHTML differs from the old playlist.

** added support for servertime when playing music
#127 User can now drop song in the searchfield

+ Support for dropping tracks in the searchfield
- The dash in the trackname is not always visible
THIS CHANGES EVERYTHING

... to many days has gone since i began working on this ...
#127 User can now drop song in the searchfield

+ Support for dropping tracks in the searchfield
- The dash in the trackname is not always visible
This 'merging' is quite hard
Merge branch 'merginghell'

Conflicts:
	index.html
add mips64el-rootfs msg
remove ul #'s
Made final fields static
Added suppresses for unchecked warnings
Removed unnecessary boxing
Removed empty methods
Removed invalid throws clauses
Fixed javadoc by removing throws
Made some fields private
Readded main
Javadoc fixes
Optimize imports
Format
Merge branch 'master' of https://github.com/JProffa/JProffa

Conflicts:
	Graph/src/main/java/jproffa/graph/Line.java
	Graph/src/main/java/jproffa/graph/internal/ManualVisualTest.java
	TestProject/src/test/java/fi/lolcatz/jproffa/test/ComplexityQuadraticTest.java
template helper "tagToUrl" moved to class TemplateHelpers
typo
added StreamControl
rewritten search(), results are printed via StreamControl
rewritten Data::getAll(), Search:stream uses StreamControl
typo (mostly reorganized Data model)
Merge pull request #4 from JanTvrdik/stream_control

Stream control and rewritten search()
Tags::extractTags is more liberal
JS for toggling advanced search moved to correct template
typo
Search: improved advanced search toggling
Date: inner joins replaced with left joins which are faster
Crawler: fixed timezone issue
template helper tagToUrl renamed to tagsToLinks
message cleaning moved to TemplateHelpers
Merge pull request #5 from JanTvrdik/misc

Several bug fixes and minor improvements
, and space were excluded from extractTags (it's impossible to search tag containing these chars)
Specified allowed symbols in tags (About page)
figured out how to display twitch api data
Merge pull request #1 from fowler446/master

figured out how to display twitch api data
Added new PDF articles from A Clerke.
Merge branch 'master' of ssh://192.168.1.12/home/git/books
add rows for my two latest schemas
Limpieza general, varios arreglos, corrección de algun pequeño error,
etc...
Implementados métodos de eliminar entidad.
Corregidos un par de despistes.
Clean up code: removed AbstractionServiceImpl.java
Revert "Revert "deps/grisu: bump version to 1.1.1 (needed by ppc build)""

This reverts commit 29dfa16dd8675b589840b6f1e5b999a917c4351f.
add MKL to README
winston: last patch was totally braindead
Add ... for long Array{Any} and Dicts in dump/idump.
Merge branch 'master' of https://github.com/JuliaLang/julia
Merge pull request #1148 from tshort/master

Dump/idump ellipses for long objects
Add a candidate "performance suite 2.0" function
rename uid to object_id. close #1067
Add Binaries quick link with the important URLs in README.md
commiting yo ass

fixed some other stuff
cleaning up almost done
more updates
done for the night
add clear keyup file
add a name for all triangles
Automatic commit of package [katello-certs-tools] release [1.1.6-1].
814118 - fixing issue where updating gpg key did not refresh cp content
fixing code style
Merge pull request #104 from jlsherrill/bz814118

814118 - fixing issue where updating gpg key did not refresh cp content
subs-tupane: new Pool class in place of KTPool with relevant attributes, all indexed for search
subs-tupane: reverted a change to indexed_model.rb
subs-tupane: since not all pools are saved as activerecords, just those referenced in activation keys, removed use of IndexedModel
subs-tupane: move some of the logic out of Pool.index_pools to the controller
subs-tupane - case statement instead of if/elsif, elasticsearch index_settings tweak
subs-tupane - changed camelCase to under_score, fixed spec tests
Merge pull request #196 from thomasmckay/subs-tupane

Subs tupane - new pool model
873680 - disallowing blank socket count in system creation
874185 - make sure we don't try and process labels when env is nil
Merge pull request #1027 from mccun934/874185-fix-fix-labelization

874185 - make sure we don't try and process labels when env is nil
Added elasticsearch deps to comp
Merge pull request #1029 from mbacovsky/elasticsearch_1_19_deps

Added elasticsearch deps to comps
875101: Use the older subprocess modules in order to work on RHEL 6
Merge pull request #1030 from Katello/bkearney/875101

875101: Use the older subprocess modules in order to work on RHEL 6
Merge pull request #1020 from jsomara/873680

873680 - disallowing blank socket count in system creation
fixing a regression i caused on one of my own bugs.
Merge pull request #1032 from komidore64/stupid-adam

fixing a regression i caused on one of my own bugs.
Merge branch 'master' into pulpv2

Conflicts:
	src/spec/models/user_spec.rb
Merge pull request #1035 from parthaa/master-to-pulpv2

Merge Master to pulpv2
Implement components interface access change.
ajout secu semaphore anti-blocage - passage mtu a 1400
Added slide transition to all links. Modified the settings data-page (now displays last retrieval date of jobs).
- Implemented User tasks
- Implemented syscalls
- Code refactoring.

- stdio: File stream functions added: fopen, fclose, fwrite, fprintf, FILE*, stdout
- stdlib: atoi added.
Add the iter_to_matrix arg to sympify (iterables to matrix sympification)

As of this commit one can use the iter_to_matrix=True argument in order to
sympify matrices.

Examples:

```
assert sympify([x,y], iter_to_matrix=True) == Matrix([x,y])
assert sympify([[x],[y]], iter_to_matrix=True) == Matrix([[x],[y]])
assert sympify([[x,y],], iter_to_matrix=True) == Matrix([[x,y],])
```
Special case check for matrices if iter_to_matrix=True in sympify.

Now iter_to_matrix=True also works for matrices:

sympify(Matrix([1,2]), iter_to_matrix=True) == Matrix([1,2])
Minor fixes & translations.
Complete
Merge pull request #134 from Arente/patch-83

Complete
Makes more Sense
Completed.
Merge pull request #35 from vinnymac/patch-14

Completed.
Update master
Merge pull request #216 from mafiox/patch-101

Some translated 2/0377
Additional testing code
Readme format and examples.
Adding compare all functionality.
refactoring: VocardDS constant names.
Revert "[mr1763] Fix wrong detection invisible for self (related for example for Succubus spells and so on)"

This reverts commit 96dc153464382c6e2795e9aa151f8f4acf9d28ba.
[mr1773] fix unneeded saving some PetAura. close #815
[mr1774] additional sort rule in MapID structure V2 (thx to Undergarun) may be related to lags. also some safety to wrapper.
Fix mage t7 effect

Signed-off-by: Reamer <philipp.dallig@web.de>
[mr1776] Fix Infusion of Light

Signed-off-by: Reamer <philipp.dallig@web.de>
[mr1777] fix Disarm Trap the rogue get out of stealth. close #823
[mr1778]  fix Misdirection and Tricks of the trade. close #799
[mr1779] check visibility of summon point only for players (thx to Reamer for pointing).
[mr1780] additional safety to Deep Wounds proc
[mr1781] Some corrects for new map system.
- Prevent exploit with fly cheat.
- Prevent falling crearures under ground caused VMAP wrong calculating.
[mr1782] fix EffectTriggerMissileSpell with unit targeting (thx to NeatElves for pointing). also implement effect_148 as SPELL_EFFECT_TRIGGER_MISSILE_2
[mr1783] implement locking in spell cooldown operations.
[mr1784] Remove wrong Calculation for next instance reset time (Remove Freezes in Instance-Reset). Revert ugly serverfreeze detection addition.
Fix compile :)
[mr1785] Load spellBonus data from DBC. sixsixnine
[mr1786] avoid usage thread-unsafe method from BigNumber class in Warden. must fix rare crushes in WardenWin
[mr1787] add some comments
[mr1788] Activate Constructs fix
[mr1789] comment fix
[mr1790] SGI STL select1st implement
Added code to set the Arm to All = 1500 when A is held down on startup.
implementing bootstrap2 for the works
upgraded efficiency from SUM(1..n) to n
Merge pull request #21 from paczian/master

upgraded efficiency of ListSelect
утром
Fix
Merge branch 'master' of github.com:MITDelian/6.172
Fixing 64 bit case...
UI Commit

ImageFlow Change and MyTongji Link Add and Catalog Item Font Change
Sound Effects changed (not done yet!!!)
Implemented PopUp and Console
Merge branch 'madsim'
Added corner analysis.
Lolol test again

Signed-off-by: MaloW <malow@spray.se>
Merge branch 'master' of github.com:Malow/PowerBall

Conflicts:
	PowerBall.suo
	PowerBall/main.cpp
"se habilita envio de alarmas"
New design for top widget is done
Db port fixed
แก้ welcome.jsf , เพิ่ม folder js,css,images
[win32] add ConvertWindowsToGeneralCharCode to CLangCodeExpander to get the non-win32-specific three char code from a win32-specific one
dvdplayer: try to find an audiostream that matches the preferred audio language setting when starting a movie
dvdplayer: try to find a subtitle that matches the preferred subtitle language setting when starting a movie
Family Target
bestpiecetotake casting
Merge branch 'master' of https://github.com/MrClement/Chess.git
Added another Haskell version, using the type system and functors.
sbt build: don't rebuild jars, extensions unless necessary
bin/issues.scala: upgrade dispatch to 0.9.3

on general principle
bin/issues.scala: switch from lift-json to json4s-native

the latter is actually just the former renamed and set free
from Lift; see https://github.com/json4s/json4s
bin/issues.scala: sort issues by kind first
bin/issues.scala: report both open and closed issues
bin/release.sh: point to Java 6 on Linux too
very minor user manual tweaking
fix some nonsensical test code in TestHalt
Merge remote-tracking branch 'origin/5.0.x'

Conflicts:
	bin/issues.scala
comment out yet another intermittently failing HubNet test
minor cleanup (rename api.Let fields)
make Procedure.dump indicate reporter procedures

this is helpful for testability. hard to believe it didn't do it
before, all this time
use a Scala collection, not Java, for Procedure.args
use a Scala collection, not Java, for Procedure.lets
clean up some Java/Scala interop stuff

that was messier than it needed to be
cleanup in tests: avoid `private`

there's no point, it's just test code
Merge remote-tracking branch 'origin/master' into core

Conflicts:
	bin/issues.scala
	bin/release.sh
	docs/programming.html
	headless/src/test/org/nlogo/compiler/AgentTypeCheckerTests.scala
	headless/src/test/org/nlogo/compiler/ExpressionParserTests.scala
	headless/src/test/org/nlogo/headless/TestHalt.scala
	headless/src/test/org/nlogo/headless/hubnet/TestClientInterface.scala
	headless/src/test/org/nlogo/hubnet/mirroring/ClientWorldTests.scala
	test/commands/HubNet.txt
Merge remote-tracking branch 'origin/core' into headless
Merge remote-tracking branch 'origin/headless' into minimal

Conflicts:
	headless/src/main/org/nlogo/generator/PeepholeSafeChecker.scala
	headless/src/test/org/nlogo/generator/PeepholeSafeCheckerTests.scala
	headless/src/test/org/nlogo/headless/TestCompileBenchmarks.scala
	headless/src/test/org/nlogo/headless/TestProfiler.scala
allow try modifiers in inline
Expanding on the behavior of package creation tool
CG VistA latest
Dampened the zoom.
Undoing previous commit because it didn't fix anything.
Fixed hooks to properly build included apps
Add agent_dialplan_connection.erl and fix module name
Patching TPCircularBuffer based on suggestion from landonf and maqr
Revert "Allow HID/gamepad input while app is in background"

This reverts commit 44bbdc8ea35e007f48fb633028e13ea5dbe0522b.
Se ha agrega el soporte de inserciones de centros de votación

* Se crea la tabla `Centro`
* El tipo de fichero de entrada se indica en la línea de comandos,
hasta ahora solo se admite: centros y electores
 * Se añade fichero de pruebas de acuerdo al formato del CNE
[AVSwitch] add missing import.
useless LOL
postgres + partial ts
thinking-sphinx
further dev
dev!
thinking-sphinx
thinking-sphinx
changed
merge test 1
merge test 2
adding palgate-core and palgate-msg as submodule
added clauses to check that the selection remains on the correct list
为组织添加validation
сделал 4 относительных фильтра на трансферном рынке
Updating build script
Putting in our 'icon' & name, for kicks
Inefficient but simple command parser (parsing input commands is not critical)
minor changes on server side
Merge branch 'master' of https://github.com/Petrzlen/spajza
i forgot
pokazeny msgcontainer
XChat rainbow text plugin
add averageonly option to call to GenericSubmitter.act
Get a class name as a NSString
Custom attribute FixedArgs work for everything except boxed objects.
Most of the framework for managed plugs is in.
modified the switch emitter to require only a single instruction to calculate where to jump to.
the __asm__ keyword no longer causes intellisense issues.
__attribute__ no longer causes issues with intellisense.
Merge remote-tracking branch 'remotes/orvid/master'

Conflicts:
	Nernel/Nernel.vcxproj.filters
	OS/Mernel/Kernel.cs
Merge branch 'issue-56-unit-testing' of github.com:PyBossa/pybossa
v0.43

Signed-off-by: pyros2097 <pyros2097@gmail.com>
Add QCOM display stuffs

Change-Id: Id9cbca37185574804e99fc5ef51f423f0d8a06e7
Remove Samsung devices since they have cm.mk support now

Change-Id: I63511b3aaba18ca6730e905be9f24c2dd2d36535
Add CM hardware module(s)

Change-Id: Ide93d4c36824fd9ce7182ac939731057d542fe95
Add su repository

Change-Id: Ib5c686e73c319fd735760b717a906b97acc7c4ea
Fix typo in su repository

Fix for b33dfde0ec2afe1a41052d05f7f330ffc06be123

Change-Id: Icad299e333530eeae2b4e420310fd010691b4026
Add QCOM audio

Change-Id: I1383e44e74b5477f0a993ea78ba0991ecc2dbf11
Add theme engine dependencies to CM10

Change-Id: Iadf18798819a0f593027a8e573cb6d81413af54a
switch to fork of bootmenu
Updating AHAskExpert.
Changlog

Updating based on changelog
removed globalRouteToPath and added restoration of original req.routeToPath
Made the help command. Starting point for others commands.
created db_conn
stuffs
Fixes RepositoryProvider.
Second commit, with add
Menu page transitions
add note about needing require json for JRUBY < 1.7.0
Set UNIX-style linebreaks
Merge branch 'master' of github.com:RvonMassow/xDoc
Merge branch 'master' of github.com:RvonMassow/xDoc
[latex] Fixed labeling of sections and altText on codeRefs
path of admin
config
Re-added php-amqplib namespace.
Updated reademe.
Simulator integration test for Distributed Scheduler

This is the start of an integration test suite for the scheduler.

It will simulate a series of temporal events such as:
- requesting an instance to be created
- bringing that instance from BUILDING to RUNNING
- simulating the keep alive pings on the host services

Currently, the simulator will provision instances of random
flavors until there is a failure. The results will the be dumped
to .../tools/simulator/output/simulator.log and, if jinja2 is installed,
HTML reports will be generated as in:
http://darksecretsoftware.com/static/lines.html
and
http://darksecretsoftware.com/static/gauges.html

This is an interim branch. The next step is to make the configuration
of the simulator possible so you have use your own allotment strategies
and custom/in-house filters/schedulers.

Change-Id: I6a55d2eddb54d9a58b5cdfad7a79a7716dbe8754
refactoring code for correct Android onResume (2)
some more tests for SpecificationBase
ennesima tabella, da migliorare
Reformatted sample data
Made some fixes for mono and fixed samples.

- Fixed master page
- Fixed make file
actually use an id path explicitly as was in the original spec, namespace safety
Rename the external syncNow to initService and make it do exactly that since that's how it was being used.
Also add a service /run endpoint so any specific synclet can be conveniently triggered to run right away, this fixes #27
update minecraft to 12w23b
Ya el jugador se puede mover mediante el mouse
read works; start a web server in ec to return object versions for reads
add python: is
Исправлено оформление панели управления
Update includes/db.php
Added Description to Gemspec
Add another git script now containing __git_ps1 function.
Rename Resize.toolbars() to a more semantic text
slightly modified API
Added support to Sony 2011 line
-s/--settings gives much more the idea of passing a settings.xml file
gestion du double click
mock.lua assumed a global function 'mock', modified to make it local.
Move trace functions to message system
tcpip: Need to call get_stack_id before brickd forwards callback packets
Disable when DISABLE_PRY_RAILS is given as env variable

I love pry-rails.
But sometimes I would like to or need to disable pry-rails.
commit some changes by TomCallon
docs: fix missing word
hello mansskj
move source to src/
split into libraries
move AvatarController to separate files
move Camera and ImageManager to new files
remove obsolete includes
Camera gets methods
add assertions
removed unversioned listed requirements in README
Merge branch 'hotfix/v0.88'
Merge branch 'release/v0.89'
Merge pull request #21 from modilabs/develop

AWESOME MERGING ACTION
Merge pull request #1 from UW-ICTD/develop

updating master branch to latest version
Merge branch 'develop' of github.com:modilabs/pyxform
Merge pull request #24 from modilabs/develop

Bug fixes
Merge branch 'master' of github.com:modilabs/pyxform
Adding jr:count capability.
Merge branch 'develop' of github.com:modilabs/pyxform into develop
Adding repeat_count alias; changing spec_tests to reflect addition of repeat_count; see https://github.com/UW-ICTD/pyxform/commit/910c20c9b5cc448e4b6430e162d16e42a154eb48 for same commit in UW version
cast control types to str
if there was a select option whose choice was the same as the seelct's name; pyxform would go in an infinite loop; fixed and added a test
merged uw-ict pull request; tests are NOT passing
Merge pull request #27 from modilabs/hotfix-infinite-loop-error

looks good. boom goes the dynamite.
Removing code that generate question type dictionary on every run and replacing it with a json_dict. Also adding function for deep copying json_dicts.
Making some changes needed for the constant QUESTION_TYPE_DICT (See previous commit)
Fixing test and commiting some benign changes so my repo stays in sync with the remote.
Merge pull request #28 from modilabs/develop

Pull (1) or_other fix and (2) jr:count fix and (3) uw-ict merge. Looks good!
Merge branch 'master' of github.com:modilabs/pyxform
beginning cascading select work by adding a simple example
Cleanse the password from command line output.
Version bump because gemcutter got messed up.
Display description and author.
New more minimal look & feel.
Version bump.
Short term fix for platform != ruby UI crashes.

We need a long term fix as this just hides the immediate problem.

Throughout we reference gems by their name and version and ignore the platfrom.
Better error reporting when the data dir is RO.
Upgrade jQuery from 1.4.1 to 1.5.2 (more effective to modern browsers)
Scripts should be loaded before </body> to minimize page load times.
When script loaded before </body>, dom:ready event is useless (DOM built before script execution anyway), so do less
Merged pull request #17 from Undev/upstream-look-and-feel.

Upstream look and feel
Merge branch 'issue-16'
Release 0.2.15

* Fix UI crash for gems built for none ruby platforms.
Add licence info.
Added an disallow_replace setting, which stops you from replacing gems that already exist on the filesystem
Default to disallowing replace.

Asking forgiveness is better than asking permission.
It's not an error if you do the same thing twice.
Protect GemVersionCollection from exploding due to [nil,nil,nil] being un-marshalled from specs.4.8.gz

I've noticed on Rubygems 1.7.2 on FreeBSD when Geminabox reindexes the gems after receiving a new gem that an Internal Error is raised due to a NoMethodError - undefined method `<=>' for nil:NilClass when calling sort!

As far as I could tell this was due to the presence of [nil,nil,nil] in the specs un-marshalled data.
Merge pull request #24 from geoffgarside/master

Fix: GemVersionCollection explodes if given [nil,nil,nil] gemdef
Provide correct install command for prerelese gems.

Resolves #19
update shapefile code to java 6
EAWEB-1 Added invitation entity
EAWEB-1 Added migration for Story and Session tables
EAWEB-1 Added invitation type to the registration form
Improved TagExample.
bundle exec is needed even if running a single test.
Update ontology/skos/README.org
Cleaned up project includes
added progress handling
introduced tcomment plugin for easy commenting
introduced vimrc config file
added a few glossary terms, fixed several typos
RegEx v3
Added event handling in general and keyboard handling in particular.
Refactoring. Unified approach to dispatching different types of events with different types of propagation.
Implemented tooltip.
Corrections requested by Masahiro Nakagawa.
assert ==> static assert where possible

(another correction requested by Masahiro Nakagawa)
fix create for icons & user prefs
Attributen + Methoden toegevoegd

Attributen + Methoden toegevoegd en kleine aanpassingen aan het
klassediagram gemaakt.
Cosmetic: minor code simplification.
Updated Traditional Chinese translation.
update Todo.txt
update vs2012.diff
MISC - Book module layout improvements
Add main preferences and move 24-hour preference to main.
Fixed selector typo for delegated find.
s/{confmodule}->/parentModule()->/g to avoid future bugs
auto-subscribe now works when multiple bundles are available
reloadTable from DataTable now remove cached fields as well
added doc for qaUpdatesAlwaysAutomatic method
first draft of authentication system
where's my commit?
Merge remote-tracking branch 'origin/master'
split form-extend module into form-shim-extend and form-native-extend
Fixed special @Page.parser kwargs
Added basic BMO scraper
Automatically generated installer lang files
MDL-34448 - mod/data - Fixing separate groups viewing all entries.
Automatically generated installer lang files
Automatically generated installer lang files
Merge branch 'install_21_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_21_STABLE
weekly release 2.1.8+
Automatically generated installer lang files
Automatically generated installer lang files
weekly release 2.1.8+
only to active members
woopra tracker ie fix
Resume book works
No need for a blank page
Merge pull request #64 from reedlabotz/master

Resume book works again
simplify host ID updates
Merge commit 'refs/top-bases/p/4120/03_reference_node_by_hostid' into p/4120/03_reference_node_by_hostid
fix Streaming test
Merge commit 'refs/top-bases/p/4443/010_refactor_range_move' into p/4443/010_refactor_range_move
mutex support
investigating mutex locking
futexes
dbek7c edits
Merge branch 'master' of ssh://katfs/home/adam/spead
found the bug!!! lock prefix should just be lock;
 time to test server
old
Merge branch 'master' of ssh://katfs/home/adam/spead

Conflicts:
	src/mutex.c
testing
Merge branch 'master' of ssh://katfs/home/adam/spead
more testing
Merge branch 'master' of ssh://katfs/home/adam/spead
testing
Merge branch 'master' of ssh://katfs/home/adam/spead
test
Merge branch 'master' of ssh://katfs/home/adam/spead
edits
more edits
edits more edits
Use class bridge syntax for corelib bridged classes
Add tooltip for items in the three columns in the "Manage Profiles" dialog

It might be a little noisy to add tooltip for each item.

CCBUG: 206471
function to warp scan based on passed deformS and moving scan.
Removed unecessary aliases
Undent vimrc
Remove unused bundles
meta sin funcionar , falta arbitraje al modificar
busquedas funcionando al 100
Update music complete
freeze sample moved
add nowrap and fix comment formatting
update config

-add mouse support (mostly for resizing window sizes)
-remove encrypt (i never use it anyway)
-fix lines from faulty search and replace
-redefine shell to use aliases
-use perltidy and bind to F6
Added new article shell tips and tricks
Oops, fixing a typo in the documentation file name.
Updated the changelist.
Fix time ordering, etc
Section name, css tweaks
Home page changes
powerpc/epapr: export epapr_hypercall_start

This fixes breakage introduced by the following commit:

  commit 6d2d82627f4f1e96a33664ace494fa363e0495cb
  Author: Liu Yu-B13201 <Yu.Liu@freescale.com>
  Date:   Tue Jul 3 05:48:56 2012 +0000

    PPC: Don't use hardcoded opcode for ePAPR hcall invocation

when a driver that uses ePAPR hypercalls is built as a module.

Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
Version bump to 0.2.0
Merge branch 'master' of github.com:agworld/soroban
compat with node >= 0.7
use mocha
release 0.2.4
Fix date and time types to use YAML types
后羿射太阳，老婆嫦娥上月亮。这对夫妻和天体有仇
swig 绑定出问题了
试试给 QObject 绑定一个 setParent(Card *) 的方法
=============
1、剧情模式统一ban掉礼物包
2、车轮战不准获得非固有技能
3、奇兵判断锦囊是否可对原目标使用
当朱贵判定画地中了的时候，于摸牌阶段发动“施号”
摸了一张牌以后，“视为你对任一其他角色使用一张【探听】”
效果就没有了
四象日志显示时机错误
[Cleanup] Renames method for improved readability
linebuf: Remove callback argument from mowgli_linebuf_shut_down

The shutdown callback can be assigned directly to linebuf's shutdown_cb
member. This function will be called whenever either a.) the remote host
closes the connection, or b.) the write buffer is empty and the linebuf
is marked for shutdown.
redmine 2.1.4 added
Remove bin in android directory
Add model classes
Add XML downloading and parsing classes
Add Search result activity
fixed file upload error display
fixes #90 -- se agrega funcionalidad edición de usuario
RELEASE!!: Posteamos.com sale a la luz!
Update lib/stores/FileStore.js

Fixed bug with undefined options var when stream() called with no param.
Added more menu elements
removing ij-errors and making selected track bigger in kymo
heroku 5
heroku 7
AHHHH
model
updated node path
Mark some GC functions pure and/or nothrow.
SEO stuffs.
added ranking place holder
Fixed scoring, added second method (forwardBackward2) in case
即選即上 體育課程的通識下拉隱藏, 確定加選位置調整
Forgot to specify a method behind a decorator.
n2

e2
changes for Xdefaults
Adding .zshrc .rc
Merge branch 'master' of https://github.com/alxers/dotfiles
Fixed appers not generating bug
Improve method for handling local site settings
Add PlayerItemBreakEvent. Addresses BUKKIT-1600
Deprecated spawnCreature and added spawnEntity. Addresses BUKKIT-1168
Remeber selected subtitle and audio track for each video file

Fixes #1141
metadata: If filename score <= 0, don't use it
Add some more debug during shutdown
ps3: Fix respawn on exit
jpeg/exif: Safer handling of strings
SSDP: Change ST in M-SEARCH to service:ContentDirectory:1

This makes (the non-conforming to spec) PS3 Media Server and
Universal Media Server respond to the query
metadata: Improve population of metadata

- Allow the user to select which of the metadata providers to use for
  a certain movie

- Allow the user to select between all results for a given movie
js: Add option to separate content in item menu
Merge pull request #78 from facanferff/master

js: Add addOptSeparator for item menu
theme: Change default background
tmdb: Drop some unused args
spotify: Plug a ref leak
kvstore: More generic to be able to store domain,key = value for each url
prop: Add prop_nf_retain()
file browsing: Add an option to sort by date
Make it possible to turn on/off the sort preference of folders
js: Add support for per-page settings
prop: Adhere to PROP_SUB_IGNORE_VOID in all trampolines
settings: Use PROP_SUB_IGNORE_VOID to avoid clearing setting on destruction
Fix various reference counting issues related to properties
glw: Avoid division by zero
glw: Avoid another division by zero
ps3: Switch mutex protocol to PRIORITY
ps3: Use a toolchain that compiles libc with -O2

When replacing malloc() I accidentally disabled optimizations for libc.
Causes general slowdown of Showtime

Fixes #928
Added tag whitelist and table of contents

Corrected problems with flags introduced in
9e10917b824d0035558031340097774718837fa0

Do not use without this revision
Corretto errrore di battitura
Изменил тип данных хибернейта и тип файла для печатной формы
Load definition
Oprava linku v README
combine cycles
hyperlink added on logo
Singleton using dispatch_once
sorting support
Klassenordner gelöscht und Sun.java nach Shapes verschoben
Ue9 sun und venus, Ue10 Datum.java fast fertig, TestDatum.java halbfertig
kleine repository veränderungen
Add some python packages too

When starting from scratch those packages must be installed too.
Merge pull request #1565 from miekg/debreadme

Add some python packages too
finish ChangeBallotView
move actionPerform code to controller
Merge branch 'master' of https://github.com/ant2/eXceedVote

Conflicts:
	src/com/github/ant2/exceedvote/view/VotingProcessView.java
Re-implemented Pair Actor 'Registry' using a thunk (Lazily evaluated block)
instead of a Future to solve a Future timeout issue.
Also tidied up a log message which was misleading (didn't fix with previous
push).
Put the instance status into lxc.conf
Design integration - Remove mock thread replies (not implemented)
chenged smile lines in pdf
changed coffe to js and added sign up validation js
change to js
added email validation
adde validatio fo user sign up page
added Attribute#del
docs
docs
docs
adding a test for rendering a simple_form with cells outside of rails.
finished tests for console input
adding acl codes to the route spec
creo que la version anterior no era correcta
Test against Rubinius and ruby-head

Dont' fail on these, though, because our main target still
is ruby-1.9.x
Move contribution guide from the wiki.

http://code.google.com/p/phantomjs/issues/detail?id=662
Fixing Windows-specific path issues with loading of modules

http://code.google.com/p/phantomjs/issues/detail?id=721
fix libev, add lua-ev
Updated the README and added licensing information
change index page link addresses
first commit
Merge github.com:asadovsky/hello
dla pl liter
Add #context, context tests and general cleanup.

* Raise TimeUnitError on non millisecond or second time units
* Clean up tests
Implement and symplify io
quantiles and trend calculation for dust measurements
Merge branch 'master' of github.com:ati/air-quality
uniquify now uses sequence ids in place of md5s
new spec for uniquify
uniquify prints table with ids
use tabs instead of commas in case commas are in the sequence id. Hopefully tabs are not
silence output so I can see the pretty rspec dots
增加原生示例代码
move framework to the end for tests
レスメニューの表示位置、表示方法を変更

レスのヘッダをクリックした時のみメニューを展開するよう変更。
メニューの表示位置はヘッダの下に移動。
v0.55
極端に大きい数値のアンカーが含まれるスレッドを開いた時にフリーズしてしまうバグを修正
add sorting method to project list
Merge pull request #21 from yevgenko/sorted_list

sort a list output alphabetically
Rewrote some for_ methods in PackageMixin class
We don't need these platforms.
JSON is required for old platforms.
added cleaner, removed dates and replaced them with ids, added tests
note where to add the crontab for offlineimap.
Basic click to place towers.

Still need to Z sort, and prevent overlaps.
Bug 805438 - [BB][Call-log] Header issues
Merge pull request #71 from batarov/dev

update MapWorldView level
implemented colorize
tough one that looper
fixed an auto-install bug
Authors and Copying
Relative date in conversations, fix jump bug in onclick event
Add push script

This pushes to gh-pages too.
Remove direct utils dep from colorjoe

Renamed utils to colorutils and made only color.js depend on it.
Make error output more useful
Bump version
added some classes in users_con.