labofsahil/github-event-dataset-2012 huggingface dataset:
Failing tests

Added failing tests for:
* multiple and attribute parameters
* custom attributes should not be duplicated when using an input file
* using directives should not be duplicated when using an input file
* using directives should always appear at the top of the file
Fixed using directive duplication and location
Custom attributes get updated instead of duplicated
Positional and named attributes for CSharpEngine
Failing tests for other engines
Less crazy custom attribute tests
Positional and named attributes for all engines
Add failing test for single blank line at end of output
Strip extraneous blanks from end of output

Fixes derickbailey/Albacore#214
Refactor logic to remove extraneous blanks from end of output
making sure that the require of win32/registry doesn't kill everything initially
ignoring a sample assembly info output
make the default target spec:all
Merge remote-tracking branch 'mh/feature/assemblyinfo-eof' into feature/asmredux
Merge remote-tracking branch 'k-old/fix-asminfo' into feature/asmredux

For testing.
Merge branch 'feature/asmredux' into dev

This commit merges both Colin Adam Kirby's (@cakirby)
fixes for assembly infos, as well as Mike Henry's (@mhenry07)
fixes for assembly infos.

Closes GH-1
changed to 10x10 boards
board init fixed
fix vimrc.bundle
Revert "HomePage"

This reverts commit 5a33c4ac2630626ea3d9b99be7a37ec74937a041.
comment removed
.ds store added to ignore
.ds store ignored
fixing tabbing in perseus & adding content to the csproj
Cmake amelioration
Cleaning code && adding new interactions
Tweak the fonts
Betty thinks about her life and goes for a run
Ensure bulk creations have quota validations

Fixes bug 1093749

The patch set also returns a proper error instead of a internal server
error when the quotas are reached.

Change-Id: Ifc74ffa8b54faa70f5558bf5263830f5e71f58ae
removed class2type cache and replaced type with faster operation.  Type now also supports custom classes/types via custom toString method.
stage one of decoupling complete, see DEVNOTES
removed reference to TreeModel in TypedNode descendents, replaced with a reference to BundleController in TypedNode itself
finished current refactoring of BrowserView
增加到韻典網的自動轉向。
Replacing 'DS' constant with '/'
Begin server
Allow arbitrary JVM arguments to be passed to wrapper / startup scripts
Merge pull request #52 from charles-dyfis-net/arbitrary_jvm_args

Allow arbitrary JVM arguments to be passed to wrapper / startup scripts
[MOD] Ruby examples updated.
* Upgraded to ASP.NET MVC 4 Beta - we might wanna use the new Web API stuff for the Server API.

* Deleted the MvcApiActionFilter.dll and the Libraries folder is were located in, as it's not used at all.
Updated readme.md to only contain minimum information - the rest have been moved to the wiki.
Made the "read more" link bigger, so it's easier to spot.
Added back information about how to participate and get started with the repository, to the README.md
Merge pull request #43 from Laumania/master

ASP.NET MVC 4 Beta + deleted MvcApiActionFilter.dll
added license to repo
Renamed paintables to pixels
style & layout
style & layout
* in Producteur model: define Region member that returns the concatenated (string) list of Regions its vins belong to
style for cepages list in entree form
img border setting for IE
* cepagehandling:  add effective list clear on blur
cepagehandling:
 * remove test function
 * clear list when input field is empty
* attempt at layout and style for vin form
Added CalgCC tests. Must be commented, cause pass too long
don't show the scrollbar slider if the child can fit without scrolling
vs2012 project fixes

The vs2012 project files need to build ui.lib from /ui, and reference
it, or linking will fail due to its lack.
remove UI::Image dependency on Gui::TexturedQuad
Merge remote-tracking branch 'skapusniak/fix/win32vc2012'
add skapusniak to the AUTHORS list
Merge remote-tracking branch 'johnbartholomew/gui-be-gone-1'
Merge remote-tracking branch 'robn/new-ui-scroller-slider'
remove scout module, needs rewrite #1587
First steps towards a Lua mission interface
Mission screen - can't tell if it works yet.
Quick merge to avoid Scout.lua conflicts
Replace all the mission calls with Lua ones
Yeah, that won't work...
Case. Ugh...
Pay attention, Brian. Stupid mistake.
Let's give Label the string it expects.
Make a default status, correct order of fields
Date looks much better when formatted.
Let's see when status is not set
Orders has been implemented.
Modes in menutable
disable checkboxes if vote cast
fixing full text on nov6
dont add slashes to contest name
tweak to candidate displays
use correct user created ballot contest_type label
better description for multi-vote races
spelling mistake in API
if votes.nil? then description with votes
adding vip_id to track id
rake db:migrate
rework process.rb and ad_candidates
new data
added pok judge and bot in testing module
Use jsonbuilder/jsonbuilder for JSONBuilderTemplate
Merge branch 'foo'
commit inutile
Merge branch 'master' of https://github.com/CICM/CICM-Library

Conflicts:
	hoa.library/hoaBinaural/AmbisonicBinaural.cpp
	hoa.library/hoaBinaural/AmbisonicBinaural.h
	hoa.library/hoaBinaural/hoa.binaural~.c
Fixed bug with controller! Forgot to add return!
top bar hack
cross browser css (chrome, safari, firefox, opera)
loading gif
another gif
poll create confirm
Rituparna Banerjee/Rupa Kulkarni - adding functionalities to delete surveys > n years of mapping
changing spelling of 'delete'
Merge pull request #14 from rituparnab/master

delete surveys > n years of mapping from system where "n" has been set to 3 years by default in the cron job.
Merge branch 'master' of git://github.com/CamfedCode/Camfed into hiding_surveys
Merge branch 'master' of git://github.com/CamfedCode/Camfed into hiding_surveys
deleting surveys that have been removed from episurveyor
Merge branch 'master' of git://github.com/CamfedCode/Camfed into hiding_surveys
Merge branch 'master' of git://github.com/CamfedCode/Camfed into hiding_surveys
Merge pull request #9 from markryall/hiding_surveys

Hiding surveys
将Map<String,String> 修改成Map<String, String[]>这样程序更为严谨
SecurityFilter 签名参数bug修改

将Map<String,String>修改为Map<String,String[]>
Merge pull request #60 from ChaoPang/master

Added new functions in the JQueryTreeViewElement to work with new tree
fix bug in renameField in case of duplicate column names
add test to check for different line endings
Merge pull request #61 from dennishendriksen/testing

AbstractTupleReader bug fix and TextFileUtils tests
add docs
fix bug: line end count for windows line endings
Merge pull request #62 from dennishendriksen/testing

Bug fix: windows line end count + improve test
fix stream close bug (refactored readers in order to achieve this)
Merge pull request #63 from dennishendriksen/testing

Bugfix: reader stream close exception + remove duplicate code
Removed cout/cerr/exit Warnings

R CMD check on Windows gave Warnings about cout, cerr and exit. cout and
cerr were replaced by Rprintf and exits by return (temp fix until I can find
something better).

Signed-off-by: CharlesJB <Charles.Joly-Beauparlant@crchul.ulaval.ca>
some changes from the old repository are added
Novas pastas

Separação dos projetos.
nu plockar den regionen från worldguard

Signed-off-by: Lucas Arnstrom <LucasArnstrom@gmail.com>
Added link to privacy guidelines in README.md
Add javadoc plugin to build since that's a requirement for central, and correct some javadoc tag problems
Roll on poms to 0.3.6
script to generate a release script
Test empty and blank features / scenarios
Add tests for setting classpath when starting a process
Poms for 0.3.7-SNAPSHOT
correct case in path - fix test for linux
Add test for spring context, change logging during self-tests to log4j to capture/suppress Spring output since Spring is logging using commons logging
Some cleanup around logging changes during self-test
Ajout webservice recherche cinema par code postal + tests
rectification jQuery
update icon docs
When removing a marker from a FeatureGroup, only remove the popup if it was put there by the FeatureGroup.

Refs danzel/Leaflet.markercluster#24
Merge pull request #861 from danzel/master

Fix FeatureGroup.removeLayer removing popups
Don't print contents of selections
Add image/png and text/plain
Update PKGBUILD
Allow strided chunked sources in execution
add description to main conda parser help
Added another correction to Windows example.
Working on getting cache implemented in ScriptAPI.
Add de-CH translation for you_have_no_orders_yet.
Direct merchants directly to production signup
Check for empty config vars
Just get all the files into here - badly broken, but I need to use branches... :-P
Start to refactor Screen inheriting from Container. Start cleaning up Widget.
More refactoring...
More Widget changes - add protected setId() for low (static) id numbers. Add layout methods.
Add/correct license header for all files.
RenderPriority -> byte, update WidgetType for easier extensibility, add missing ScrollArea (which might later get removed).
Change class inheritance, add serialVersionUID, improve default constructors.
WidgetType constants to UPPERCASE, rename Vanilla gui elements, add Padding and Border to Widget.
Refactor layout (Padding. Border and Margin) into subclass of Widget.
Started to rewrite to use generic Attr(ibutes) and consistent methods to set/get them. Major improvements for network code and storage space, slight slowdown for access (EnumMaps are significantly faster than HashMaps) - render code needs to cache and make use of Dirty values...
Start to get back into coding, move Gradient and Label over to new system, remove "Generic" prefix for widget classes.
Start getting back into coding, Gradient and Label now using new system, remove the "Generic" prefix to widget classes.
TInt21 maps and sets now do negatives!
Signed-off-by:Darsstar <darsstar@gmail.com>
Added World.getEntity(int id)
Signed-off-by:Darsstar <darsstar@gmail.com>
Fix re-entrant issue with vector calculations
Added more helpers in Spout
Fixed another re-entry into the lock

Signed-off-by: Olloth <olloth@gmail.com>
more re-entrant fixes
re-entrant issues the sequel
re-entrant issues again
fixed const pointer to pointer definition
DELTASPIKE-274 add unit test for AbstractContext

too bad this isn't working right now due to OWB and Weld
Arquillian connector issues with Extensions
DELTASPIKE-274 enable unit test for AbstractContext

This contains a dirty hack by adding the test Extension
via the test classpath for all tests
DELTASPIKE-276 upgrade to apache-parent-11
DELTASPIKE-276 upgrade hamcrest and Arquillian
PERMISSION. Typo, lol.
Fix: minor vulnerabilities
Trans: Update language files
New: Prepare code to allow any module to change/add content of
predefined mail and signature.
New: More import options. Thirds Bank Accounts
Merge pull request #455 from simnandez/develop

New: More import options. Thirds Bank Accounts
Fix: Can clone a proposal
Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.1
skin widgets support, watchlist support fixed for tvshows and movies
skin widgets support, watchlist support fixed for tvshows and movies
in progress tv shows home menu link not working
Merge branch 'master' of git://github.com/jeroenpardon/skin.refocus into pvr

Conflicts:
	720p/IncludesAddons.xml
create page report grade today 1
Merge branch 'report_grade_today' into dev
Added padding for body on fluid phone
Merge branch 'master' of https://github.com/E2Blue/MetroWebUI
[ticket/11103] Fixing some bugs with the post/topic notifications

PHPBB3-11103
[ticket/11103] Display number of notifications in the [ Notifications ] link

PHPBB3-11103
Corrected jaxb2 version
Première vrai commit

Suppression des conneries et ajout des dossiers de nom !
-Update SurgSim stuff
Hecho para consultar el estado de la shipping, 
Hecho y completo para despachar el vehiculo
Merge branch 'master' of https://github.com/Encoming/encoming.git
breadcrumbs
Merge branch 'master' of https://github.com/Eptis/crowdrevolt
Switchs from io/console to highline gem for < 1.9 rubies
Changes the version to 1.0.3, multiple bugfixes
finalize translations using locale properties files
change tips locale-content to use innerHTML
Bump version, improve compatibility with MacPorts build
Editing motherfuckers, do you speak it
filter by private pack or not
change private pack location on repo
options tab fixes
better GitHub data handling fixes #2
move blog link left a column, as suggested by lmak
s/vimscript/viml
Now with .vim and .vimrc stats :)
New BioBrick files.
avance en about_constants & about_control_statements.rb
About_true_and_false.rb completo
added "acadaYear" - academic year to Course Schema.  Added "desc" - description to notes schema
Settings are now saved with a CSV writer instead of own 'CSV writer/reader'
replaced magic opcodes by enum-constants
Added padding to #noresults
Fixed style block
fixed retarded mistake
fix for bgpos on expandos
Readjusted style ever so slightly
Changed font of up/downvote counts (on sidebar)
More updates to scores.
Merge branch 'master' of github.com:aphoenix/r-wow
Handle reflected param names for variable length arguments
SE実装済、パラメータ調整済
Resource distribution redone
Base class loader added.
TestSerializeWithRecursion added
Fiz mais uma alteracao na parte visual
Added FileHelper
some events bug
Version number is required in this format.  So we just reference the appropriate tag, which is now it-0.9.2.
Sql_Admin Add file
Search    -> OK!
Calendar -> Event CRUD of(CRUD) with AJAX. but deleting badly
Search    -> OK!
Calendar -> Event CRUD of(CRUD) with AJAX. but deleting badly
Search    -> OK!
Calendar -> Event CRUD of(CRUD) with AJAX. but deleting badly
igor999
Adding a license to all .h,.cpp and .qml

Also, adding LICENSE, COPYING and COPYING.LESSER text files, which
includes the GPL and LGPL licenses (we are using LGPL).

Signed-off-by: Rodrigo Goncalves de Oliveira <rodrigo.goncalves@openbossa.org>
updating FlowScale to most recent version including new target folder
Fix row move proxy & guide when frozen columns
Only bind mousewheel events if the jQuery plugin is loaded
Update TODO list
Merge branch '2.0-frozenRowsAndColumns' into gh-pages
Added `ResourceClaimLayer` trait to World for cnc and d2k.
Adding "ecf remote test framework project"
Updated mazegen.
Re-organised functions

Just changed the order the functions were written in; no biggie
Changed some configuration to allow easier updating.
tries using debug mode.
More work on collision point and normal
camera with acceleration
new file:   images/NekoLeftArm.png
	new file:   images/NekoRightArm.png
	modified:   js/core/Neko-Nin.js
	modified:   js/core/NekoNinData.js
	deleted:    images/nekoarms.png
	deleted:    images/nekoarms.png
Merge branch 'transition' of https://github.com/KamiWorks/nekoNin into transition

Conflicts:
	js/core/Neko-Nin.js
	js/core/NekoNinData.js

	modified:   js/core/Neko-Nin.js
	modified:   js/core/NekoNinData.js
Ajout frameClient.ui
Merge branch 'master' of github.com:KaneRoot/ihmsem6a
some little changes on kittyPIMP
klar til at lave observer og tools
Fixed empty team errors
configure main.js login for DOM elements
Show info when no ack for message was received after 10 seconds.
Simplified transform class
Use objectTree to admin_pages class
unify the name of classes and files
Add test for removing guest

Running libvirt test with sample configuration create guest that stays
in system after the test. This complicate running test again. For xen is
this issue bigger complication as it does not allow to run pv and hvm test
in one run (second of them will fail as name exists).

This patch adds simple test 'remove_guest' that take care of removing guest
from system. This test is added to sample configuration of libvirt too.

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
-
**************************************************************************************

	+ Neues Feature
	- Entferntes Feature
	# Einschränkungen
	: Aufzählung

**************************************************************************************

+ Game: Fehler bei der Ausrichtung des Geschützturms behoben
+ Game: Fahrzeuge können Gebäude eingreifen
        Fahrzeuge fahren zu den Gebäuden hin (vorläufige Wegfindung dahingehend!)
+ Game: Fahrzeuge reparieren sich selbstständig (einstellbar in der der Config.)
+ Game: Modell des Hauptgebäudes wurde integriert
+ Game: Grundlegende Wegfindung über Potential Fields.
		: Noch nicht parallel
		: Problem, wenn Fahrzeug auf einem ungültigen Tile steht
		: Gruppen werden durch die Selektion ermittelt
		: Unschöne/kantige Wege wie zuvor (Smoothing fehlt noch!)
		: Problem Reduzierung bei Wäldern
		: Hält Abstand zu Gebäuden und Wald

+ Config.: Neue Einträge:
		: LifePerSecMainBattleTank
		: LifePerSecMobileTank
		: LifePerSecTankDestroyer
zsh autopushd
Merge branch 'master' of github:LegionSB/dotfiles
Merge branch 'master' of github:LegionSB/dotfiles
Powerline script root paths, rbenv silence output on rbenv init
Appollonius: extended Appollonius to accept lines
Conflicts:
	librecad/src/actions/rs_actiondrawcircletan3.cpp
infodist2: more cleanup, fixed a building error
Templates: bugs #3562301 #3562305 #3562306
Neon Cubes and many fixes

- Fixed High Score Screen
- Improved Main Menu (and High Score Screen)
- Vastly Improved Lighting
- Neon Cubes in Lust
- Added Icon
- Added Splash Screen
- Added Build Settings
added point information in result returned by neighbors function
2012-10-05 13:18 add stack function, change code style
- Create mmaps with debug output by default.

  Creating movement maps with debug output allows you to use the RecastDemo
  application to preview generated maps.

Signed-off-by: TheLuda <theluda@getmangos.com>
add bridges to DESERT
Change search: find replaced by globpath + filter. Some code decors
Included the PID and PROGMEM libraries. Got rid of uchar declarations because typedef doesn't work in arduino unless you're using progmem, which I think we need to avoid for variables that aren't static. Unstaticed some statics.
Update Mapping.ino
#3  new Salle peut être modifier et afficher
Been working in funton and eclips so much I forgat all about Git, Here is a commit
replaced _0 by view
added dan.txt
Clean up code and it's comments
Implement test for poll structur(echo)
Fixed content dir and added gameengine and gamelogic namespaces.
Версия сервера 1.3
created page blog
まだまだ続き 20120624
catears
+FindUtils
#50 (1) Códigos por usuario
Forums Database
Added rating to Movie, updated database seed and created migration.

Signed-off-by: Cassy "Mina-hime" Brink <minalien@gmail.com>
fix share buttons
Merge branch 'master' of https://github.com/Mixtapes/mixtapes
Merge branch 'master' of https://github.com/Mixtapes/mixtapes
update mixtape skins
Merge pull request #31 from Mixtapes/new_skins

New skins
Add <delete>, <home>, and <end>
Merge pull request #2 from ConradIrwin/master

Add <Home>, <End> and <Delete> key support
- server part of the mini project (chatting program);
- function for determining maximal and minimal areas added;
- comments added to the source code.
Added case test
Merge branch 'dev' of https://github.com/MrHedge/Mos-Login into dev
Tilføjet plugin support...
Opdatering af states til hentning af klubinfo...
Implementation af Grand Prix Stævner...
Version++ v.1.3.5

 * Fix af nye konfigurationer..
 * Implementation af Grand Prix Stævner..
[Ядро/Руссификация]: Русификация телепортеров в Цитадели Ледяной Короны и Ульдуаре.
[База/Русификация]: Перевод по квестам 790 и 25134 - Начальная Зона Орков и Тролей.
[К прошлому коммиту]: Исправление опечатки
[База/Задания]: Фикс квеста 4921.
* Перевод госсипа по этому квесту.
[Русификация]: Полная русификация Кузни Душ
[Ядро]: Русификация Стандартного Приветствия у Npc
[Ядро/Механика Заклинаний]: Реализация CC Delay.
* Автор: Walkline
Update: Path website installation
Merge branch 'master' of https://github.com/Nekrofage/myeshop
Fix race condition causing multiple login threads - Code from Wolvereness
json schemas are retarded
lua 5.2.1

completion: Applying the 5.2.0 advanced readline patch, which appears to be compatible with Lua 5.2.1.
pkg-config: Note that Lua 5.2 is no longer distributed with `lua.pc`.
Use a rolling average to smooth out roll
Ship control tweaks.
working resync of the binary stuff
refactoring image with package
SceneMappings now have season number
Allow scene name to be used for renaming

New: Added option to use scene name for episodefiles
Moved Use Scene Name to top of checkboxes
Release group is added to history and episodefile
Merge remote-tracking branch 'origin/master' into release-group
Added test for Newzbin release group
Restrict nzbs based on release group, server side

New: Only grab NZBs if release group is wanted (configurable)
Allowed release group added to UI.
Release group will be shown on history now.
Release group shown on history details, take 2
Merge branch 'release-group'
Fix: Saving series will update the grid row with the new quality.

Fix: Added tooltips to Edit and Delete series buttons on grid.
Fix: Added tooltips to menu links.
Lab 5 end, lab6 start, lab7 outline
update cabac_init
update trace sps and sliceHeader
add pragma to disable display
Update rank in poj
FIXED: sb bug from CPY. added interrupt_reset
FIXED: offset error in syscall.lib
Fix some wording in Conventions section of readme
Add bubblestorm logo draft to use in readme etc.
Use logo in readme
Lagt till knapp

En ny knapp för viktiga dokument.
USER_EVENTS- Statistics work

TODO: auctionServer- side
viewplant changes
Merge branch 'master' of https://github.com/PlantEKG/PlantEKG
Merge branch 'master' of https://github.com/PlantEKG/PlantEKG
Merge branch 'master' of https://github.com/PlantEKG/PlantEKG
small changes
Merge branch 'master' of https://github.com/PlantEKG/PlantEKG
We can search plants case-sensitive
changed search page
Add an important note to the interpolation example
raise a NotFound rather than a Forbidden
make existing tests pass after adding catalog view indirection
fix the warnings in menu component
Fixed "Hide tabs when there is only one tab" option.
- fixed hiding tabbar when using "Close other tabs" action
moved pad-us/ to nlcd branch in pad-us repo
use our own PhoneUser model instead
fix a bug in the reconacing if two min or min/max
changes on the coord transformation, but I have to take a better look
removed Monster.jar from my direct
Implementation of the API i underway...
modified:   public/assets/application-50751b40f8fb98823bbd8a61ed2e8e7e.css.gz
	modified:   public/assets/application-641bd200472f03340e0b8ede16cb396e.js.gz
	modified:   public/assets/application.css.gz
	modified:   public/assets/application.js.gz
	new file:   public/assets/easy-dfe12e92845f4e89e1ade8c70dbd73e1.png
	new file:   public/assets/easy.png
	modified:   public/assets/manifest.yml
	modified:   public/assets/public/application-7270767b2a9e9fff880aa5de378ca791.css.gz
	modified:   public/assets/public/application.css.gz
Merge branch 'master' of github.com:RasoTeam/platform
	modified:   Gemfile
	modified:   app/controllers/public/job_offers_controller.rb
	modified:   app/views/backoffice/companies/index.html.erb
	modified:   app/views/rasocomp/users/index.html.erb
	modified:   config/locales/en.yml
	modified:   public/assets/application-641bd200472f03340e0b8ede16cb396e.js.gz
	new file:   public/assets/application-ce20b1c34d680877cb2b83e9e9b7e739.css
	new file:   public/assets/application-ce20b1c34d680877cb2b83e9e9b7e739.css.gz
	modified:   public/assets/application.css
	modified:   public/assets/application.css.gz
	modified:   public/assets/application.js.gz
	new file:   public/assets/idea/part3/EMP3-3500dd66c48e6650ec67bd7619fa1311.png
	modified:   public/assets/idea/part3/EMP3.png
	modified:   public/assets/manifest.yml
	new file:   public/assets/promo/EMP3-7893ff1c6eeea8bb269042cc126209c8.jpg
	modified:   public/assets/promo/EMP3.jpg
	modified:   public/assets/public/application-7270767b2a9e9fff880aa5de378ca791.css.gz
	modified:   public/assets/public/application.css.gz
Merge branch 'master' of github.com:RasoTeam/platform

Conflicts:
	public/assets/application-50751b40f8fb98823bbd8a61ed2e8e7e.css.gz
	public/assets/application-641bd200472f03340e0b8ede16cb396e.js.gz
	public/assets/application.css
	public/assets/application.css.gz
	public/assets/application.js.gz
	public/assets/idea/part3/EMP3.png
	public/assets/manifest.yml
	public/assets/promo/EMP3.jpg
	public/assets/public/application-7270767b2a9e9fff880aa5de378ca791.css.gz
	public/assets/public/application.css.gz
Updates
Merge branch 'master' of git@github.com:RavensKrag/WireFu.git into levels
Fix power zipline.
Add autosuspend to the autostart list
Merge branch 'master' of github.com:Razor-qt/razor-qt
some Textfixes
Done revision et localite
Started chart parsing
bump version
refs #4: Add MediaType as constant to RestDoc 
http://github.com/RestDoc/java-spec/issues/issue/4
Start work on diffing and writing metadata to disk
Split hash read from file
Call functions dynamically
Walk diffed hash
Changed from dot points to code block style
Removed non existant file
убрал горизонтальный скрол и ограничил список соседей
Confirmed that the diff-match-patch library is the best option to perform the 3-way-merge I need.
Started testing out an idea for the merge-algorithm. Still needs a lot of work to be fully opperational.
Resolved a reference problem to the diff_match_patch jar.
Created a 3-way and 2-way merge algorithm for Blobs, I still need to implement them at the Repository level to merge full Trees. Also, I made a sub-class of Commit, called MergeCommit that can track two parents.
Decided to remove the MergeCommit class, I will add a method to the Repository the adds a 'merge commit', but only to differentiate from the addCommit() method. Tracking two parents is not necessary, if it is later I will change the parent variable to parents and make it a LinkedList<Commit>.
Begun work on the log, hoping to discover the source of the numerouse bugs that have revealed themselves in my tests of the Reposiotry class.
Fixed the infinite loop bug, it was hiding in the getAllCommits() method. It would infinitely be true inside the while statment and crash the thread. Now I have refactored that and other methods to be more stable, by relying on recursion instead of loops.
* append
Making some changes to model
Add Readme file
Add manual
updated alerts module
updated ie6 stuff
0.95049 Flight Updates
Examples: Remove large binary and input files.
Merge branch 'master' of github.com:STEllAR-GROUP/hpx
Attempt to fix the linker problem for context switch performance test on Linux
Add create playlist custom action, add print custom action, use fuse to mount non .backup image files
Use black background and white text on tooltips
l2hash: make it non-abstract, but ram_control specific cache
l2hash: written eblob_l2hash_init()
l2hash: more consistient comments
l2hash: written eblob_l2hash_destroy()
l2hash: more consistient parameter naming
l2hash: input checks in eblob_l2hash_destroy()
l2hash: renamed key to l2key to reduce confusion
l2hash: added lookup routines
l2hash: written eblob_l2hash_resolve_collisions()
l2hash: added error propagation to eblob_l2hash_lookup_nolock()
l2hash: fixed spelling in comments
l2hash: written eblob_l2hash_compare_index()
data-sort: get bctl from wc
Added folders from old odesk project
Special:Wikiplaces : validateNewSubpageName bugfix
Implemented usage of JSHint for .js files
Fixed msising rem and added debug to config.rb for firesass
Added Numeration and alDamageMeter to positions reset command.
Added more channel check.
Version 1.5.8 - Updated required mamertes version
[maven-release-plugin] prepare release FIRST_LABEL
Another desparate attempt to have pretty documentation.
switched to So8res version of eunuch
tracking fish.vim locally
ignore netrwhist
update fish
add fish as a plugin
make visual indentation smarter
Picked some low hanging TODO fruit
added hume plugin
Switched to viewport
Updated TODO
Merge branch 'master' of https://github.com/Soares/config.vim

Conflicts:
	.gitignore
Testindex angelegt
Add colours for messaging.
Add parsers/serialisers for few more packet IDs
SONAR-3325 Searching for files when package names are too longs
SONAR-3528 Pagination is broken on reviews widgets

Fix regression introduced during fix of SONAR-3404 (see commit
c8278a1e6bca00368405a760b3ab8d0d4c32f146): the name "limit"
used to allow loading more reviews is the same as the one used by
the widget's partial to paginate.
=> now, the partial uses "table_limit" as parameter
SONAR-2084 missing whitespace
Fix whitespace in pagination footer
Fix favourite stars in filter widgets

-> move from prototypejs to jquery
Change location of buttons in management of filters
Sort languages in Api::Utils.languages()
SONAR-3825 Check "Favourites only" by default when added to criteria
SONAR-3825 improve performance of SQL request

* UNION is replaced by INNER JOINs
* sorting is done by Java but not by db
SONAR-3887 refactor semaphore API
Merge remote-tracking branch 'origin/master'
Updated the 'Add your space' section.
Add API to determine if a component can be detached. Prevents accidental
removing of Transform/Datatable/NetworkComponent(s) (for example).

Signed-off-by: Chris Sanders <zidane@outlook.com>
Get data directly for frustrum planes

Signed-off-by: L5D <cholley.thibaut@gmail.com>
New way to upload to the server.
Change the paths that we get msvcrt and zsync from.
Use a different method of getting zsync progress.

Zsync only produces output when its stdin is a terminal, which isn't
the case on windows. Attempts to recompile it to change this
behavior proved fruitless.

So instead, we look at the downloaded file, and see how closely it
matches the correct file. (By downloading a list of hashes for each
64k block in the correct file.)
Basic windows developer docs.
Only include script version if it's not already in the project.

This lets one rebuild a project aimed at an older version of Ren'Py
with a newer version, while retaining compatibility.
Fix typo preventing the update button from showing up.
Mention that Editra does not support IMEs.
Fix typo in docs.

Thanks to horstjens for reporting it.
Fix im.matrix.colorize to actually work.
Allow the game itself to define patters as to what is and is not
executable.

We use this to apply the xbit to Editra.
Deal with the case where downloading an editor fails.
Only offer rollback to the user if rollback is enabled.
Give the user a place to go if they ignore errors in the launcher.
Archive files in the_question.

This is used to test archiving on multi-plaform builds.
Fix errors on archiving.

The problem was that we were using rollbackable lists and dicts in
our archive, before the rollback system was ready.
Include python standard library into the linux builds.

Use the right directory name for it.
Match xbit and documentation patterns against filename with / prefixed.

This makes all pattern matching consistent.
Store documentation patterns in a variable.

Instead of ignoring them entirely.
Fix argument order for zsynmake.

On the mac, positional arguments seem to have to come after flags
Fix several documentation typos and minor mistakes.
fixed a lot jslint problems
Merge branch '0.1.0-beta' into gh-pages
Revert "Match format for linux ctags output" since this has broken CTags that actually have the fields that this the old regex matches. @anatol submitted a recent pull request (see request for backout in #61 comments) that was merged to fix issue in #57.

This reverts commit 64dc685edee7ca5312f71ac8e23c763f1847f165.
Merge branch 'i18n' of github.com:Subsis/subsis.com into i18n
AGAIN MORE UPDATES!!!!

AHHHH
larger .gitignore
Maven Migration Complete

Converted project from jar based to maven based project
removed the feature to scrape in either direction
which wasn't that useful and introduced a lot of unwanted complexity
Status now affects active pokemon when the EndTurn buttons are pressed
and the state is in BATTLE
Merge branch 'nativeAndroid' of git@github.com:TableTopGT/pkmncc.git into nativeAndroid
Add llvm syntax highlighting
20.9g
do kategorie firem přidáno Telesales
21.0
en nabidky FCL
torzo nových AIR nabídek
oprava potvrzeni objednavky (logo bylo moc vpravo)
+?
22.0
Skoro dodelane AIR (ktere se asi budou jeste kompletne predelavat)
View pro prepravy presunut na SQL server + odstraneny dlookupy z dohledavani duplicit
V pozemních přepravách se rok/měsíc/týden/kurz bude načítat z první nakládky (při odeslání KL)
V objednávce pozemní přepravy je dole doručovací adresa
Nastavené správné řazení silničních přeprav
Přidán "Jardův stav" do seznamu přeprav (porovnává aktuální datum s ETS/ETA/datem vykládky)
22.1
opravy a sjednocení zobrazení kontaktu v comboboxech (přeprava, kontejner, ...) - asi z toho udělám view
22.2
oprava kontaktu u vykladky v kontejner (chybelo tam ID jako prvni sloupec)
23.0
Pridana prvni verze preprav AM Trucking
23.1
drobne upravy u AM Trucking
v SQL zmena triggeru aby byl v cisle i akronym
drobna uprava leteckych nabidek
Update the Notepad Editor UI.
Updated the Notepad Editor UI.
Updated page styles.
+Fixed FireFox Notepad Editor page.
+Changed the main page divider colors.
+Changed the main page header.
Mobile content.
Remove content libraries...
Remove libraries....
Merge pull request #30 from SergeTruth/master

Multiple updates to the UI. Tested on IE, FF, Chrome.
Begin adding data, finished some reward stuff
add missing imports for cocos2d extensions
documentation first ruler + more informative indentation
added a sexy grid image
Fixes for: C API extracted from core library
RechCopie - Debut
Differentiation: fix parse order for summands and multipliers.
Differentiation: add Differentiation module.

Also, extract some functions to auxiliary module Utils.
Differentiation: remove unused func. from Utils module.
Moved events/links to views/links
Fixed an issue with models/graph.js
Hack to deal with rolled back transactions. Until a better solution can be
found.
make it so tests can run on Linux

Fix Visomics_LAUNCHER_EXECUTABLE to reference the APP_NAME
variable.
Merge branch 'RunLinuxTests'

* RunLinuxTests:
  make it so tests can run on Linux
changes on ScreenSong for party mode are nearly completed
Don't print nag about jsutil
Extracted messages so we can discuss translations
Syntax lapse
kinect motor play
Merge branch 'master' of github.com:WIZARD-CXY/shadow
Added index.html
Merge branch 'master' of github.com:WebMario/WebMario
room dimensions can now be implicitly inferred from walkableMap if it exists
Merge pull request #87 from Gankro/master

room dimensions can now be implicitly inferred from walkableMap if it exists
Checking of Vector class
modified:   DisplayManX.lua
	modified:   interface/vctypes/vc_image_types.lua
	modified:   interface/vmcs_host/vc_dispmanx_types.lua
	modified:   test_dispmanx.lua
#21: Moved networking code into its own package.
Kleiner Bugfix in der Additionals Admin Form
official power estimates
Pengin.php をpreloadで読みこむようにした
Update html/modules/mailform/Controller/EntryView.php

ゲストが controller=entry_view にアクセスしたときはアクセスを拒否するように変更した。
Add memcached to deploy process
New way to handle player variables
GetVehicleModelInfo(VehicleModel, VehicleInformationType)
Delete one function deleteT()
Delete one function deleteT()
Pridana vygenerovana kostra GUI
Refine diagnoses reference.
Modified the notification cron job to support hourly notif
Adding the new named script
version bump for new feature
allowing gets to go through while splitting(not complete)
add 404 and search by label
Merge branch 'master' of https://github.com/ablanchet/trenode
mid: fixed a typo bug.
high: added support for delete operations over datafiles `fw-admin -d foo`
remover database.yml
REIXS: Fixes bug in REIXSXESScanConfigurationView that would overwrite the configuration's gratingNumber() to 0 whenever being constructed on an existing config.
REIXS: removes detector height offset from scan configuration, etc.  Revise scan action editor to include the most commonly needed information (grating, tilt).  Include scan length in scan configuration description.
VESPERS: Started code cleanup.  Starting with enums.  This commit is for the Beam enum and all of the classes associated with it.
VESPERS: Continued code cleanup.  Migrated the Ion Chamber enum.
VESPERS: Code cleanup.  Migrated the Geometry enum.
VESPERS: Code cleanup.  Migrated the fluorescence detector enum and changed all the associated code.
VESPERS: Changed the syntax of setCcdDetector to setCCDDetector. Fixed a possible crash bug if you don't provide any data sources to spectrum viewer.
Adding Omega theme and site admin toolbar
change version to 0.9.15
make pie chart start from correct location
fixed name variable
Merge remote-tracking branch 'origin/devel' into devel
Added views createrepositories
Update async runner
Added MIT License
Merge branch 'master' of github.com:ahaley/Picgallery
initial commit
Merge branch 'master' of github.com:ahaley/vim-config
global-web example uses launcher DSL (flexible ports), and improve README
better parsing of comma-separated things, including from CLI Main; and use a builder for quoted string tokenizer
if jclouds fails to find template, list the available images; and type-coerce minram etc coming from prop file (strings); and give examples of imageId, minRam in the docs
remove sensor no longer used
API Algorithm related
archive and change page title
Use debug log level for verbose log messages.
Merge pull request #101 from dylanahsmith/debug_for_verbose_log

Use debug log level for verbose log messages.
update thoughtbot logo
Added related files to admin
Add blank post for ec2 dns post
Update homepage
Use hunspell instead of ispell
Authenticate automatically to IRC.

Truncate IRC buffers.
Move custom faces to color theme

Use regexp for search, query/replace

Use ibuffer instead of electric-buffer
Add alias for newsbeuter
Remove broken code to configure external keyboard
Use IPv4 when streaming
Use flyspell and auto-fill in latex-mode
Use Python3 by default
rcirc tweaks

Truncate buffers. Add utility function to clear activity from modeline
Use ibuffer in the same window
Make comments on HN easier to read
Rename file to avoid collision
Increase minimum cache (for streaming)
Initial commit
Initial commit
Customize ibuffer some more

Sort buffer names by default

Create some default filter groups
Dim whole line for uninteresting people (bots)
Clean up ibuffer empty groups
Remove empty custom-set-faces
update to support lazy loading
with https://github.com/FasterXML/jackson-module-hibernate/tree/master/hibernate4
Ensure PSake exits on error.
Merge pull request #87 from alastairs/feature/PsakeBuildFix

Ensure PSake exits on error.
Install fish by homebrew, add info on key mappings
changes
Merge branch 'master' of github.com:alexandru/emacs.d
removed junk
Push latest changes - added ido mode
(17:15 - 17:27) Bug fixing
Changed README syntax
Fixed contact updates

now just need to merge the old add code into the update code
initial push
Merge https://github.com/alinke/PixelAlbum
stupid mistake fixed
retarded mistake fixed
massive mistakes fixed
massive mistakes fixed
voting system now included
Changed BusMethod and SignalHandler invokation to use defered callback.

Change-Id: Ie1fd74ca3b926040a975cbf3967ff11f787cda71
WS

Change-Id: I8fbf7579ca5fefac4b649e6288c8db4061b13443
Adding a stub page for jobsearch and route
Added @memespring's form stub
basic styles for form
Remove left margin from input
Switch input for button
ie6 input fixer
Remove attribute selector

Stops styles working for IE6 & not needed anyway no submit is button
Upgrade IE fix to include 7
Remove static related items

These should come from Panopticon instead
Build the new jobsearch page using the artefact and publication

We need these to set the related items, breadcrumbs, analytics info and
the format icon.  We should also maintain requests for the JSON version
and make sure we set the cache headers properly.
Copy update
Merge branch 'jobsearch' of github.com:alphagov/frontend into jobsearch
Add copy to 'Before you start'
updated copy
Make button like other start pages
Add tests for updated jobsearch service page.
Merge pull request #168 from alphagov/jobsearch

Simpler, clearer and faster job search form and content

Reviewed by @JordanHatch, @phae and @tombye and me :-)
Copy changes and filtering out display of max_employees where it's 0 and makes no sense
Add an area for the transcript to go
Tidy up unnecessary brackets on a method.
Switch the primary dev backend to elasticsearch.
Pull out elasticsearch operations into a client.

This provides a lower-level elasticsearch interaction layer we
can use in Rake tasks; it also means we can keep URL resolution
in one place.
Use the elasticsearch client class for Rake tasks.
Fix misnamed logger when creating a null backend.
Make explicit the dependency on a Solr backend.

This has brought up the fact that only the `upate_test.rb` tests seem to
be testing the interaction with the Solr backend at the HTTP level; the
other tests in the `integration` folder, therefore, are more on the
level of functional tests on the application logic, or testing the
integration with Sinatra; they are not testing interactions with the
Solr server.
Update binaries for JMeter
Include graduated discount
Remove console
Move node costs into model
Fix errors
Editor: plugged object delete and scene reset actions into menubar.

Default scene on the initialization is now created via resetScene action, in the same way like via menubar.
Set default git push to simple
マップ差分の読み込みミスに対処
デネブラD追加
偵察機とセンサーの名前が混同されていたバグの修正
オルグレン湖水基地 天貫く光芒 追加
オルグレンD マップ差し替え対応のみ
オルグレン マップ差し替え対応
偵察機の飛行範囲に縁取りを追加
Temp commit
Merged with origin
use Expression.translate instead of .overloadMethod
Import ARM binaries to avoid need for cross-compilers
Gemfile source url for plugins updated
About  Object #<Client> has no method 'destroy'
Added reader for sequence factor.
fixing background.js
creating initial style
move read_dev_agreement to a datetime (bug 780741)
Commands can now have more than letters
Adding loading settings from __init__ (contextual), continue implementing entry-points in bind9 backend
Disabled close button for task done
Fix for null progress monitors.
Hardening quick fix proposals.

* Catch all exceptions coming from refactorings, so ImplicitConversion expanders get a chance to appear
* Run 'isValid' on refactoring actions in parallel
* made the regex used to expand implicit conversions work with multi-line strings.
Log exceptions happening during quick assist proposal gathering.
Pre-populate rename dialog with selected name.

Fixes #1000981
Merge branch 'issue/hardening-quick-assist'
Indented code blocks in listings
Fixed broken URL definition to Oracle JDK
Only show accessible members in the completion lists.

Fixed #100784.
Fixed comment.
Fixed Helium 2.9 nightly

* Compile against 2.9.3-SNAPSHOT.
* Removed automatci activation of profiles based on scala.version.
* Adapted build scripts to pass the right profile.
Use 2.9.3 snapshots
Merge pull request #93 from scala-ide/issue/show-only-accessible-members-1000784

Only show accessible members in the completion lists.
Fix Maven 3 warnings by specifying Maven-Source-Plugin version and using project.version in place of version
ImplicitHighlight should not force re-typechecking of source

Forcing typechecking of a source is an expensive operation for files with more
than a few hundreds lines (e.g., take the Typer source in the Scala project,
which is about 4KLOC).

Moreover, forcing typechecking is often not necessary, as it is the job of the
background compiler to decide when and how a source should be typechecked.

It turns out that the ``ImplicitHighlightingPresenter`` was calling
``compiler.body(source)`` to find all implicit conversions. ``compiler.body``
forces re-typechecking, which is bad.

The fix was simply to call ``compiler.loadedType`` instead, which perform a
full typechecking of the passed source only if the source is not yet loaded.
Fix NPE when `tree.original` is null (happens in 2.10).
Fix for 2.10 compatibility: `ClassTag` is now a class, coming from Predef. In the quest for source compatibility we assume there are no other tags and fallback to the class tag.
Don't show the dialog if the presentation compiler fails to initialize in headless mode.
Removed the duplicated pattern branch that tripped the virtpatmat into generated wrong bytecode. This one was fun to debug.
Look in the right place when hyperlinking to object members.
Bumped Sbt version to 0.11.2-scalaide05 to account for binary incompatible changes in 2.10.
cleaned app.html
added `debug.js` for debugging
added ember.js and ember-data submodules

for easy updating of ember.js and ember-data
symlink created to support the textmate format
Refactored code to make it clean and tidy
Worked through the AbstractConverter's post processing code. I think we're in business now
added test cases for lrubuffer, guessIndex method in diskcostcomponent, added test cases for queries with projection
21-10-2012
Further work on room generation.
prepare to actually use the hpc BEAST
Working fuzzy reduction for the simplest caes
@avenkata (Aravind): Updated my key.
Blog index: fix comment count pre-load.
Post page: streamline social buttons code.
Tweak Facebook comments implementation.
Social buttons: flip FB and Tw. Ah, much better!
Facebook comments: fix broken mobile view on iPad.
Minor: fix OpenGraph tags.
Exp: use Gravatar as default OpenGraph image.
(Re-)add Google Analytics tracking script.

Where the heck had it gone??
Merge branch 'develop' into gh-pages
Changed theme to Tomorrow-Night
Removed dependency on other python scripts
for merge
merge conflict
merge conflict
merge
chopping trees
removing env changes
removing env changes
initial rails new
first rails commit
Created cosmology directory and dummy __init__.py file.
	new file:   cosmology/__init__.py
copy from Andrew Beckers' module with some changes
Adding some tests
add numpy import
adding documentation, tests, and a first go at a proper api
fixing typos and written style
add mechanism for getting and setting a default cosmology, add pre-defined cosmology instances for parameter sets in the parameters module, add tests
Add a configuration file option to set default cosmology; make Om, Ol, Ok non-keyword arguments to Cosmology
Make docstrings conform to astropy format, enable all functions to accept arrays of redshfits, tweak tests, add a reference key to the parameter lists.
fix pep8 issues, add license lines
changes to doctrings, add Cosmology class placeholder, add CosmologyError
guard-ego is now part of guard itself
[Fixes #13335195] compass changes - fixed screen.sass
initial
Merge branch 'master' of https://github.com/asvavilov/3dclock
minor tweaks to oai/harvester
Added image copying instructions.
Remove trailing whitespaces and trailing lines
use stable branch as default.
Merge remote-tracking branch 'avakarev/remove-trailing-whitespaces-in-templates'
Empty files, to make empty var autocreated
Add gitignore
Eliminate dependencies on text-rendering from regression tests.
Text-rendering was dependent on unrelated system factors.
Update test suite for enhancements to ConvertToRGB* family.
Move textrender tests to machine-dependent.
Updating submodules and boxfile
Updated minion-backup module reference
Added cache module
iOS - Build fixed; added missing files to csproj
Fixed missing using statement.
We now initialize MediaEngine with AudioStreamCategory.GameMedia.
Merge pull request #960 from anselmolsm/develop3d

iOS - Build fixed; added missing files to csproj
Merge pull request #983 from SickheadGames/mplayer

MediaPlayer Fixes
Fix GL related exception on Android after multiple resumes

The issue arose from the static list `GraphicsResource.resources` being cleared when the devices was reset. During the second reset, the shader resources weren't in the list so they couldn't be invalidated. Since most of these resources would survive the reset, they shouldn't be cleared. Instead the list is pruned of expired (ie garbage collected) weak references.

Also improved a comment and tightened the GL error checking from logging to exceptions in ShaderProgramCache. It seems that if ever these errors were logged, the program could not recover and it would fail subsequent error check anyway.
Merge pull request #989 from Aranda/fix_android_multiple_resumes

Fix GL related exception on Android after multiple resumes (988)
Annoying iterative BTree Inorder Traversal!
css upload song and pics