labofsahil/github-event-dataset-2012 huggingface dataset:
Add unit tests to default Make target.
Quieten Make-based build.

This doesn't suppress error output, but it does suppress command echoing.
Add 'build' dir to .gitignore.

This cleans up the .gitignore file considerably, as we no longer need to individually ignore the files that are only found within build/.

We still need to ignore *.ll, *.o and *.tesla, but only within the strawman directory.
Lose old, now-superfluous Makefile.
不知道为什么Git识别不出来了，总认为变动了，只好重新Commite
Merge branch 'master' of https://github.com/CapsuleMe/Capsule
It's making me take out the @Override in some methods in SettingsActivity for it to run without errors
added basic geometry adding
geometry editing wip
editing wip
editing wip
edit wip
removed geometry creation
moved cdb.js to cartodb.js
merged
Activates table varnish cache invalidation after updates
Error when computing user database size
When trying to compute user database size, postgres was returning an exception
if the database contained temporary tables.

Thanks @strk!
Adds support for GML files on the importer
Refactoring: Renamed AsDoclet to CDoclet
Added missing include to Android makefile.
Work on loading map from memory
Re-added Use Case PNGs
Updated old downloader removal method once more to address
cross-compatability issues.
Change marker click tracking. Only care if the map has been dragged if we are not draggable.

If we are draggable and we get a possible click then we don't need to care if the map was dragged as we would have been handling the drag.

Fixes #1223
Merge pull request #1244 from danzel/fix-events

Change marker click tracking. Only care if the map has been dragged if we are not draggable.
fix bug in #1131, update build
Don't null the pointer we use
Switch to callbacks + many other fixes.
Fix broken conflict handling
Sync handles can fail on json parse
Progress bar workarounds from callbacks, suited for CLI display
Completed data.csv file
Fix #3511004: PrivateFieldCouldBeFinal false positive (-- and ++ operators).
Changes for help
Merge branch 'master' of github.com:CodeTag/bomberbot
changed the play/stop functions of song, and made the play button on the
main screen work.
Merge branch 'master' of https://github.com/Colinwielga/beats.git
change to zoom
added colin 8
upgrading rhaptos2 tag - need to review
compatible with nginx
changed from webview to graphicsview; stores comics information on Comic class; shows a little preview
And then there were tanks!

Playing around with mesh rotation and model building or something. Not
slacking.
WYIL: added missing rule to collections logic.
WYONE: added support for extracting the numerator and denominator from a rational.
WYONE: another bug fix for collections.
Refactoring the whiley repository structure to be multi-module project.
Making progress refactoring to multi-module project.
Code Revisions and Additions

Changed the code of several existing GUI elements and added a few new
ones.
added config.ignorePatterns option
Сервер: исправлено удаление животных в фазу вымирания
Документы: обновлена uml
ТестКлиент: добавлена первая рабочая версия
Сервер: работает прием/передача/обработка сообщений, закрытие соединения,

добавлена полноценная поддержка нескольких клиентов через пул, интерфейс
для запуска сервера
Looks promising.  Created yet another helper function for my BST.  Woo hoo for TLAS \!  (That's three-letter-acronyms...)
Dette er stress
Fix requirements
Add Podnapisi service
Use the pythonic syntax for not in list
Clean up unused stuff in unittests
Minor UI changes

The text for Check In/Check Out is now changed to Checked Out
Also removed unused exception variables
Fix: delete go back to list.
Removed deprecated field
correct bug #360
Task # 104: Check if module invoice is active and user has creation
permissions. Move creation invoice to action bar into customer card
Fix: Warning into perms page
Merge pull request #436 from simnandez/develop

Task # 104: Check if module invoice is active and user has creation permissions. Move creation invoice to action bar into customer card
Fix: add mobile phone in contact list
TODO: Fax is obsolete and not used by several companies
New levels, and include existing levels in levelpack. Not really ordered yet.
commit last changes
Merge branch 'master' of https://github.com/Drrodrigues/DPRep

Conflicts:
	HumanResourcesProject/WebContent/resources/js/hrss/view/TimesheetList.js
Last commit after merged from Diogo
Commit
[ticket/11103] Some improvements to the user loader

PHPBB3-11103
Fixed issue # 54 - null values and util
Get rid of the virtualenv bash wrapper we were creating on-the-flight
MainView orientée event.
Continued GUI, Added Go and Pause Events
Jura is another great Sans Serif Open Font, and is the new FOSS@RIT typeface.
Branding+=1
Still need the '| n' when displaying
Billy Mays there
Added the CircuitConverter files.
Merge branch 'master' of https://github.com/FelixAkk/synthbio
Prepped for tplino build
tests: do not use the --overwrite parameter.
tests: fix naming of E* tests.
unpaper: fix --start-sheet/--end-sheet parameters (they were inverted).
tests: add some extra tests for merging two pages in one.
DB commit and rollbacks in ModifyUser
Remove debug line from last commit.
Remove @TODO about adding setting MusicBrainz server.
Rearrange the debug section of artist.html a bit.
Added link to different languages in footer
Merge pull request #2 from Aethelflaed/gh-pages

Added link to other languages in footer.
Add support for opacity.
Properly clamp color samples, for real this time.
Fixing redirection for users without company.
change feature context inherit principes
adding to ignore
SRAMP-9 adding scripts to setup brms connection
SRAMP-9, making configurable
SRAMP-9, working on being able to invoke a workflow in jBPM5
Merge branch 'master' of git://github.com/Governance/s-ramp

Conflicts:
	s-ramp-client/src/main/java/org/overlord/sramp/client/brms/BrmsPkgToSramp.java
	s-ramp-governance/src/main/java/org/overlord/sramp/govenance/JbpmRestClient.java
Merge branch 'master' of github.com:KurtStam/s-ramp
Merge pull request #93 from KurtStam/master

SRAMP-9 working on BPM integration
SRAMP-4 setting the artifact as a structured extension element
Link object accepted by __set
Remove a default parameter value not used
Merge pull request #11 from JensRantil/remove-default-param

Remove a default parameter value not used
Building musl with --enable-debug, fix to building busybox to make sure it never tries to use host 'strip'.
Fixed matching gift wizard naming

Bug introduced with non-required Household object would put Null in the name of a Matching Gift for Contacts without Households.
Fixes #2: Displayed animation list out of sync
update rvm stuff
Update zsh scripts
Remove rails env
Delete crap aliases
Set vim as editor, rvm to path
update stuff
delete pow
remove aliases
add ack extensions
added pretty simple build.sh script for .deb and .rpm
Added modules as part of firmware update (oops)
REFACTORING: Removed unused library.
generalize rcemake
fix adding authored materials to folders
Don't show redzone until an attacker is selected
Merge pull request #2 from Incantus/fix/redzone

Don't show redzone until an attacker is selected
Modif'
Add grid framework
deleted unused classes
Merge branch 'master' of github.com:JacenLakiir/Vooga
Fixed a few minor things that I didn't fix last time. :p
Added last modification date to the Page / PageFetchResult
Improved logging of the WebCrawler
Changed equalsIgnoresCase to equals
Whoops, forgot to update README
Added supa translate
Credit card validation test added
added some sections
added 1 section
PUSHING STUFF
Create agent in the right team
ajout nouveau source
ADd choicebidulechouete
don't allow overriding root

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Return early instead of block
single cycle with correct output

but not sure the correctness of Data_Memory.v
fixed cloudant incompatibility with bulk post requests
v0.5.3
merged master
next changes, still drafty
used modules
added postgresql client
Merge branch 'master' of https://github.com/jayostinowsky/GoldStar
Updated Requirements
Removed /t
updated UI
changed sq
added mobileview.html/js
Changed some localization files.
fix kumafy defaults
-Just commiting
Merge branch 'master' of https://github.com/Kurios/4803AIGame

Conflicts:
	Caverns/Caverns/Char/PlayerChar.cs
Commiting small things...
Merge branch 'master' of https://github.com/Kurios/4803AIGame

Conflicts:
	Caverns/Caverns/Caverns.csproj.Debug.cachefile
	Caverns/Caverns/GameScreens/MapScreen.cs
#13 Cleaned project
Merge branch 'master' of github.com:Kurmaev/firstsite
Done with saving (meaning save, save as, save on exit, and auto-save). Next is project properties features.
put a QSslSocket instead of a tcp socket
Added SMGS

added all the machine guns....all of them shoot there own ammo
Using += because I hate repeating things
Added operator images, removed most Jquery-UI draggable elements, started reworking the operator chain into selectable dropdowns instead.
Merge branch 'master' of github.com:LeslieM/BlinkeyIO
muParser: replaced fparser with muParser
Squashed commit of the following:

commit 38f27379c196182808b0877664c2467a62e753ab
Author: Dongxu Li <dongxuli2011@gmail.com>
Date:   Sun Apr 1 14:07:42 2012 -0400

    snapper: file cleanup

commit 3cb2e1e55ffd4da55c910afc74f9d3c0f2c6a5d7
Author: Dongxu Li <dongxuli2011@gmail.com>
Date:   Sun Apr 1 08:40:36 2012 -0400

    muParser: avoid NULL pointer

commit 43b3ee997dced1ede9ac082019ace3e679f6cf33
Author: Dongxu Li <dongxuli2011@gmail.com>
Date:   Sun Apr 1 07:15:55 2012 -0400

    muparser, building fixes

commit 943c860b5bfafea25d2ea3883513f28ad34de49c
Author: Dongxu Li <dongxuli2011@gmail.com>
Date:   Sun Apr 1 05:52:47 2012 -0400

    muParser: cleaned up fparser

commit e7908fc8d8ea6e1bc47869e1e630066bc3ecb62d
Author: Dongxu Li <dongxuli2011@gmail.com>
Date:   Sat Mar 31 10:35:07 2012 -0400

    WIP

commit 56fca9c0594119044bc2340e67c18d9384494603
Author: Dongxu Li <dongxuli2011@gmail.com>
Date:   Sat Mar 31 09:10:51 2012 -0400

    initial integration of muparser

commit 2809b90d2a85d7f753758189fa8d4e8d50f042d5
Merge: bdc11e8 f9f3377
Author: Dongxu Li <dongxuli2011@gmail.com>
Date:   Sat Mar 31 08:38:55 2012 -0400

    Merge branch 'master' of github.com:dxli/LibreCAD into dli

commit bdc11e8898bf48276fb738c6ea539d2f6c7153b1
Merge: 3a3f34c 8d9d962
Author: Dongxu Li <dongxuli2011@gmail.com>
Date:   Fri Mar 30 22:03:02 2012 -0400

    Merge branch 'master' into dli

commit 3a3f34ce887e49af0c992c48e159b59c70e1b031
Author: Dongxu Li <dongxuli2011@gmail.com>
Date:   Thu Mar 29 19:31:17 2012 -0400

    printpreview: suppressed debugging messages

commit 292f3e4d8c7472c3ac176b322ab16eb0956345de
Merge: 6ac90e0 410e438
Author: Dongxu Li <dongxuli2011@gmail.com>
Date:   Thu Mar 29 19:16:34 2012 -0400

    Merge branch 'master' into dli

commit 6ac90e0fea2e7ad526a0fe0d6a063e2d199e575c
Author: Dongxu Li <dongxuli2011@gmail.com>
Date:   Wed Mar 28 04:01:35 2012 -0400

    printpreview: implemented fixed paperscale

commit cf571bb2092f0cbd9349b3103b7db85afd0c2521
Merge: 2692678 486cb3f
Author: Dongxu Li <dongxuli2011@gmail.com>
Date:   Tue Mar 27 19:00:32 2012 -0400

    Merge branch 'master' into dli

commit 269267810197e84f0868298c10b04ce8bbf1d62a
Author: Dongxu Li <dongxuli2011@gmail.com>
Date:   Fri Mar 23 22:40:27 2012 -0400

    redo/undo buttons only enabled when needed

commit 727eda884873b430474904118b238e746a097865
Author: Dongxu Li <dongxuli2011@gmail.com>
Date:   Thu Mar 22 06:54:18 2012 -0400

    dlgscale: avoid using invalid factor, bug#bug#3509845

commit 00a3c476feae2e90940d96208e4ef12299e3545d
Merge: 4e8c5e3 25d31f8
Author: Dongxu Li <dongxuli2011@gmail.com>
Date:   Thu Mar 22 00:40:06 2012 -0400

    Merge branch 'master' into dli

commit 4e8c5e39fc5292f95d30be5c53ebc23645fe9808
Author: Dongxu Li <dongxuli2011@gmail.com>
Date:   Mon Mar 19 06:21:54 2012 -0400

    print preview: lock scale across documents, request#3506219
improve Versioning
fix split on \r
Merge branch 'dev' of github.com:LibreCat/Catmandu into dev
better description
changed local size for kimura selection as 1
Added a few videos showing visual theme
Added initial death hook.
Log: Adapt provision logging to simpler and more efficient usage pattern, was too aggressive.
Changed Highscore title if no highscore were there yet to "No highscores yet"
reduse workers
Added MAEC comparator v0.2 (MAEC v2.1 support)
Folders refactoring.
[MamutGame] Modal content position fix
Slideshow

Updated
Response key renamed (list -> result)
Update for HTTPS API, and rename fields to reflect current API.
Release 2.30.0.
Implement first useable version of a LinkedList
HW 6 - Completed the base functionality - DONE
HW 7 Added the right logic for clearing cursor
updated the R4 document
Merge branch 'master' of github.com:Meraz/FOOT_Pacman
added L4
rezolvat problema noua gerenics
Edited HTML file to use parameters and put in right place. Small additions to Ball tests
lines, curves, raytracing, meshes, textures left
Right template fixed
bug fixes

UTF-8 encoding
Removed build outputs.

Accidentally checked in some build outputs. Removing them.
updated setup_mail file
Merge branch 'email'
Merge branch 'master' of github.com:Mixtapes/mixtapes
updated spec files and installed guard
Merge branch 'master' of github.com:Mixtapes/mixtapes into testing
added several unit and instance specs
set up integration testing and simplecov
more integration test setups
Merge pull request #21 from Mixtapes/testing

Testing
working on the operators
Add dependend files cache to the compiler. This will allow regeneration of the file if its dependency change mtime. Also added parsing "@import" to the LessFilter. E.g. If we have "bootstrap.less" which has content '@import "variables.less"', the "bootstrap.less" will be also regenerated if the "variables.less" has been changed.
Update package.json

As there seems to be a bug with the recent update of uglify I will fork racer and refer to it.
Removed id of ReservationItem
Added JDoc SEE to Reservation/IReservation
Added JDoc SEE to Address/IAddress
Added JDoc SEE to Guest
Added JDoc SEE to Party/IParty
Added JDoc SEE to Option
Added JDoc SEE to ResItem/IResItem
Added JDoc SEE to Category/ICategory
Added JDoc SEE to Room/IRoom
Added JDoc SEE to Habitation/IHabitation
Merge branch 'dev' into domain

Conflicts:
	src/at/fhv/roomanizer/domain/Habitation.java
	src/at/fhv/roomanizer/domain/person/IParty.java
	src/at/fhv/roomanizer/domain/room/Category.java
	src/at/fhv/roomanizer/domain/room/IRoom.java
	src/at/fhv/roomanizer/domain/room/Room.java
Merge branch 'dev' into domain
more robust json_cache dir
added distributed binary to list of ignored files
dependency: Automake => CMake
createAll/destroyAll more scalable

Before this change, createAll and destroyAll called redis for each and every model in question. This caused node to hang for minutes when scheduling thousands of these calls, even though the calls were async.

This change also includes our first tests for Together.

Signed-off-by: Scott Nonnenberg <scott@nonnenberg.com>
????? "Programming is fun"
Adds Autoload to Composer Json File

The NoCrupht namespace will map to src/NoCrupht.
Also adds empty file to src/NoCrupht so version control can track.
Fixed up validation bugs
Update to latest version of Grayskull
Added sublime files to .gitignore
Bumped to version 0.9.1
fix slice header
forgot one file with the last commit
clean the code
Issue 805 was fixed.

git-svn-id: http://orient.googlecode.com/svn/trunk@5966 3625ad7b-9c83-922f-a72b-73d79161f2ea
Javadoc fix.

git-svn-id: http://orient.googlecode.com/svn/trunk@5967 3625ad7b-9c83-922f-a72b-73d79161f2ea
retrieve session on page load
remove debug messages
send rules for an event to the javascript in setup
show ads to prod

Signed-off-by: Dan Kruse <kruse.dan@gmail.com>
PADSTALE must be off, since its always in scope
week one MiU
Added a (should-be-obvious) note about non-affiliation with Github and Zendesk
- ajout formulaire (visu) ajout de binaire
Basic Core

made a basic core for the irc bot
Merge pull request #2 from LiquidHelium/master

Some basics to get started.
add a document type to the demo
automated update: Mon, 23 Apr 2012 12:38:23
Merge
Merge branch 'master' of https://github.com/RaDiu5/sit2012-13

Conflicts:
	src/app/tmp/cache/persistent/myapp_cake_core_cake_dev_es-es
	src/app/tmp/cache/persistent/myapp_cake_core_file_map
new change in file2
different background music for main menu and level
Remove pyc files which should have never been committed.
Add documentation on platform parameters.
Add pymunk file to repository.
Merge branch 'master' of github.com:RavensKrag/WireFu
Removed <Category>System</Category> from the DesktopSettings.
1、删除了不必要的素材
2、修改了帮助信息的内容
preparation for vvm opcode execution, compiler development and testing
Contractor Class
Initial commit.
Habito 0.0.2
Made the employment_proposal_spec.rb tests pass
Created passing tests for the proposals_pages_spec.rb file, all green, go go go
#4 - Add breadcrumb and small calendars.
Ignore warnings during training.
btns module more robust, moved links into reset
gatti pawn movement taken care of
Merge branch 'master' of https://github.com/S4RK/chowka-bhara
Added debug
Merge branch 'master' of github.com:SLIPD/Basestation
Jean Luc replacement
Hive commands to query and export EMR jobs to Amazon s3 bucket
binlog: unbreak build with -DWITH_BINLOG=OFF
binlog: removed warnings with -DWITH_BINLOG=OFF
blob: added error message on checksum verification failure
Merge branch 'devel' into binlog
Background sound control refractor.
Removed extra css dependency
Added quote character to quote
beta version if WidgetsFramework
wdiget GooglePlus: url parameter fix
Updated .gitignore to ignore .DS_Store stuff and __pycache__
Making program counter (pc) a member of virtual machine. Then, we can put the JMP and JNZ implementations in the unary jump table.
Forgot to replace python2 with python
Changes for CT.
KeySingleRedefiniable, changed HSV->RGB color converting, added missing
delta argument in Room.onTick()
getActualStringXY() with Font argument
Simplified fix not working for some snippets
Merge pull request #61 from vinsonchuong/refactor-folding-fix

Simplified fix not working for some snippets
Sphinx-based documentation initialised
Unneeded headers
Unneeded headers
Minor changes
Bugfix
Add some details to the description
SONAR-3083 allow to display children of developers
Adds multicurrency support to the EconomyService API.

Signed-off-by: Sleaker <sleaker@gmail.com>
Merge pull request #471 from Sleaker/master

Added Multicurrency to EconomyService
Added to/from format string to ChatTemplate

Signed-off-by: zml2008 <zach@zachsthings.com>
Missed a file.

Signed-off-by: Olloth <olloth@gmail.com>
jax_rs en bonne voie
docs: Correct the title and abstract to indicate that SC/19 applies to SRO data.
docs: SC/21--Improvements to the content and ordering.
docs: SC/21---Append bibliography citation numbers.
docs: SC/21---Use co-add except in labels.

There was both "coadd" and "co-add" previously.  Holly had actually
changed them to coadd, which I believe is wrong.  A Google search found
"co-add" but not "coadd" in this context.  To me coadd rhymes with
toad.  So I took the liberty of correcting them.  Some were
incorporated into commit 9ad9383078faa7. ---MJC
docs: SC/21---Typo's and English corrections.
docs: SC/21---Renamed graphics files to adhere to the standard.
docs: SC/21---Add new graphics introduced in Commit 9ad9383078faa.
docs: SC/21--Fixed miscellaneous typo's and typography, made more consistent.
docs: SC/21---Used the standard sc.tex prologue and removed unused definitions.
nye test, gameimpl refaktoriseret og r.txt nu med spørgsmål til casper
Improved inline CSS of error messages
Improved pagination library
Added Hades Test class and improved HadesStrategy
Ajout de la classe distribution.
Merge branch 'master' of github.com:Supermanu/projetZ
Ajout de la classe RunManager
изменила Сложность с ТехФакторах и Факторах окружения
Update README.markdown
Update README.markdown
Update README.markdown
roo rooted
Fixed find and parenthesis finding.
Merge branch 'master' of github.com:SynthSeq/synthseq
Fixed small issue with sine waveform when passing 2Pi
Resized image on about us
snapshot changes fix
Merge branch 'master' of ssh://github.com/Talend/tesb-rt-se
Exclude webapps/camel from included ActiveMQ distro
docs fixat, en levelruta skapad
Coded a guess-my-number game in 10 minutes for Mini Jam 2
[Pramod] Trying to FIX FB share button
Add initial week view and data model
Completed static pages, routes, starting users controller
FIX: The ANSI color is upset after reload settings if 'revert color' is setted.
split + migrate TestClock_System to tck
Fixed the ordering of error messages on registering
Merge pull request #6 from TiddlySpace/passwordconfirm

Fixed the ordering of error messages on registering
test upload newpatchsystem
Labo reseau - Etape 2 - Ajout du BeanCSV + Test CSV
SC_ACTION delay time converted to milliseconds

The SC_ACTION structure expects that the time to wait before performing
the specified action is in milliseconds, as documented here:
http://msdn.microsoft.com/en-us/library/windows/desktop/ms685126(v=vs.85).aspx
Updated internals
debug printing improved
printer methods renamed
Made around me load faster and updated blabber story view heading
Update for README-Installation
Added Abstract Sematics latex
Merge branch 'master' of https://github.com/Ucombinator/Tapas
Fix session redirects bugs 1
lots of changes, support for rjs modules
optional require-js module support
aggiunto file xml categoria con prodotto e canc ~ files
added an example in NY
CHange form .lu to .org
ignore hashes and count all
FF16.0.2 update
http://webconverger.org/updating_firefox/
Added the skeleton of the tests that should be implemented.
Merge branch 'develop' into feature/row-implementation
Renamed CsvColumn::setCsvHeaderCell() tp setHeaderCell() to match with the naming of it's getter.
Completed the tests.
Implemented the code to pass the tests.
Merge branch 'feature/row-implementation' into develop
All is working, but smells
WinChange
Fixed a bug with email campaigns
Fix #54: HUDs are now rendered in their own pipeline. This means they should always appear above everything.
#21: Removed client management from the Server class. It is now a response manager that leverages a separate class for client management. ClientManager is built as a client tracking layer above message handling.
#87: Guests now see the "waiting to connect" message as soon as they start connecting.
more cleanup and consistency changes in the project files, switch to /MT and /MTd
add ac-power gui status for laptop
Better tool description
ObservableProperty fixed, inheritance and lots of other stuff too

No more "property sharing" through prototype; expenseModel finally got
tested
added link to school records (WatIAM White Pages)
About to improve the location search autocomplete with geolocation biased results
Added new overview
Commit empty README to test repo setup.
Initial release of Espresso's SQL Engine
Update Oxley email.
Fixed email address
Implemented support for +, -, *, /
Bug fixes
Warning clean up
Documentation
Merge branch 'master' of https://github.com/aantenan/Espresso
Continued restructuring

Cleanup up config settings
Fixes switch statement
Completely remove java6
Update logged rediction
newPlan integrated
Changed test case to Junit 4
mid: improved algorithm of some functions.
initial checkin
Introduced
Added index page and removed link to atlas-sw site.
*** empty log message ***
Updates to allow add/delete of rules and multiple rules of the same type
in a check configuration.
Removed dead code.
Updates to add a comment to each rule to help differentiate multiple
instances of the same rule within a check configuration.
Bug fixes.
Added instance comment to each rule configuration.
Documentation updates based on change to allow multiple check rule
instances in the same check configuration.
Update to production release v3.1 of Checkstyle Jar and docs.
Update to production release v3.1 of Checkstyle Jar and docs.
Code cleanup.
Added rule description to rule selection dialog.
Updates for v3.1 release.
Remove use of Boolean.valueOf(boolean), which is new to JDK 1.4.
Update to Eclipse v2.1.
Code clean-up.
Workaround for Eclipse bug 38221 on the Mac platform.
Additional logging for error cases.
more -180/180 testing fixes
fix sign bugs on feature score
Thank you, ScraperWiki
Static Pages created
Basic Layout with tests and devise for Authorization
Updates install script, fixes tmux.conf
reversed done
roots_loop problem
crap code
Merge branch 'master' of github.com:adrianleb/laBamba
Merge branch 'master' of github.com:adrianleb/laBamba
test
Merge branch 'master' of github.com:adrianleb/laBamba
waves with durations, dude
Merge branch 'master' of github.com:adrianleb/laBamba
Added setSpinnable, getSelectedWedge and spin.
target-sparc: Let cpu_sparc_init() return SPARCCPU

Make include paths for cpu-qom.h consistent, so that SPARCCPU can be
used in cpu.h.

Turn cpu_init macro into a static inline function returning
CPUSPARCState for backwards compatibility.

Signed-off-by: Andreas Färber <afaerber@suse.de>
sun4m: Use cpu_sparc_init() to obtain SPARCCPU

Needed for {main,secondary}_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
sun4m: Pass SPARCCPU to {main,secondary}_cpu_reset()

We can now use cpu_reset() in place of cpu_state_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
sun4u: Use cpu_sparc_init() to obtain SPARCCPU

This prepares using it in sun4uv_init().

Signed-off-by: Andreas Färber <afaerber@suse.de>
sun4u: Let cpu_devinit() return SPARCCPU

Needed for main_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
sun4u: Store SPARCCPU in ResetData

We can now use cpu_reset() in place of cpu_state_reset() in
main_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
leon3: Use cpu_sparc_init() to obtain SPARCCPU

Needed for main_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
leon3: Store SPARCCPU in ResetData

Allows us to use cpu_reset() in place of cpu_state_reset() in
main_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
target-ppc: Let cpu_ppc_init() return PowerPCCPU

Adapt e500 mpc8544ds machine accordingly.

Turn cpu_init() into a static inline function returning CPUPPCState for
backwards compatibility.

Signed-off-by: Andreas Färber <afaerber@suse.de>
ppce500_mpc8544ds: Pass PowerPCCPU to mpc8544ds_cpu_reset[_sec]

Allows us to use cpu_reset() in place of cpu_state_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
spapr: Use cpu_ppc_init() to obtain PowerPCCPU

Needed for spapr_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
spapr: Pass PowerPCCPU to spapr_cpu_reset()

Allows us to use cpu_reset() in place of cpu_state_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
ppc440_bamboo: Use cpu_ppc_init() to obtain PowerPCCPU

Needed for main_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
ppc440_bamboo: Pass PowerPCCPU to main_cpu_reset()

Allows us to use cpu_reset() in place of cpu_state_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
ppc4xx_devs: Use cpu_ppc_init() to obtain PowerPCCPU

Needed for ppc4xx_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
ppc4xx_devs: Pass PowerPCCPU to ppc4xx_reset()

Allows us to use cpu_reset() in place of cpu_state_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
ppc_newworld: Use cpu_ppc_init() to obtain PowerPCCPU

Needed for ppc_core99_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
ppc_newworld: Pass PowerPCCPU to ppc_core99_reset()

Allows us to use cpu_reset() in place of cpu_state_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
ppc_oldworld: Use cpu_ppc_init() to obtain PowerPCCPU

Needed for ppc_heathrow_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
ppc_oldworld: Pass PowerPCCPU to ppc_heathrow_reset()

Allows us to use cpu_reset() in place of cpu_state_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Fixed manifest
Added updated manifest
added small border to images
merged
merged
removed database
Setting up git prompt, paths, and remapping macvim/janus leader
background processes working
Allow CURRENT_SCHEMA as well as CURRENT SCHEMA.
merge mmcm: Add CURRENT_SCHEMA as a synonym for CURRENT SCHEMA for consistency and compatibility with Postgres.

https://code.launchpad.net/~mmcm/akiban-sql-parser/current-schema/+merge/140040
Lexer: Minus, plus number handling fixed
SIGSEGV errors fixed, when the atom not found in the tree
attempting to merge style and reports
Merge pull request #2 from aberke/master

Merges
lotsa changes
clean up started
[TASK] Reorder again…
Update deployment path for new staging machine.
Merge pull request #86 from alastairs/feature/deployment

Update deployment path for new staging machine.
qitoolchain: fix a typo in error message

Change-Id: I7fdefe903b194bb890586fa9d5e44cbe0443738a
Reviewed-on: http://gerrit.aldebaran.lan:8080/1454
Reviewed-by: dmerejkowsky <dmerejkowsky@aldebaran-robotics.com>
Tested-by: dmerejkowsky <dmerejkowsky@aldebaran-robotics.com>
Snake v1.0
initial celery support

this feature worked for me in a local development setup but isn't field testet yet
closes #9
some pep8 cleanup
allow email links with mailto protocol

closes #32
fix email sender name

this now finally closes #31
thanks to @sspross for reporting this issue
fix the redirect view to not include google analytics data in links which aren't http or https

this also inserts analytics data in the right place when a url has fragments
Use description rather than overview in browse pages
Capitalize the MOT in 'MOT insurance' for search result pages

We really need a better mechanism for doing this...
Add new colours file
Update the greys
Switch protocol for videos dynamically

This ensures that videos are in the correct security mode when loaded.
Merge pull request #117 from alphagov/meta-description

Added a meta description to the homepage
Fix enumerable

Had no test for contents so was showing the detailed results for empty
sets.
Merge remote-tracking branch 'origin/10_shades_of_grey'
Merge branch 'master' of github.com:alphagov/frontend into search-mobile-changes
Merge remote-tracking branch 'origin/ssl-fixes-video-player'
Merge remote-tracking branch 'origin/capitalize-mot-insurance'
Merge remote-tracking branch 'origin/search-mobile-changes'
Tell search engines not to include completed transactions when indexing the site

These should generally only be landed upon when you've completed a relevant transaction.
Don't include meta descriptions by default

In general search engines will do the right thing, and the big ones don't use the meta description
for indexing. If specific formats need to set descriptions that's up to them.
Fix accept handling for support

We now accept anything, but 404 for a missing template (caused by json
requests etc...)
Make sure border appears on all category list items on mobile
Disable content negotiation

We're not officially supporting it anyway, and it was causing some caching issues.
Add class to results `<div>` for single results

Search page with a single result requires additional styling
Merge branch 'master' of github.com:alphagov/frontend into search-mobile-changes-2
Redirect all json requests that hit frontend to contentapi (except places)

All JSON responses should be coming from content API. Places needs to
use frontend for legacy reasons but we'll be migrating it soon.
Stop forcing job search transaction to open in a new window

Discussed with Ash and Stephen and agreed that this one shouldn't open 
in a new window.
Merge pull request #133 from alphagov/less-new-window-links

Stop forcing job search transaction to open in a new window
add file uploading logic
Add empty db.
ignore npm-debug.log
parser fix for escaped strings

* don't use homegrown 'escapeInternals' function
* update various tests
0.4.0
add initial setup data for asu
Update gschem ru.po
added document.* files to gitignore to avoid commiting them
Implémentation de la gestion des stocks

TODO : reste à récupérer l'objet
changes for version 0.14.1
version 0.14.1
Removed a few more dependencies and a first draft at the epmem_worker interface
killed old readme
Added more Set properties, standard deviation
add report command

reports on the survey log
The update screen shows the current version, not the latest installed.
Improves speed and responsiveness of updates
* Updates updates-r-simple to 1.1.0
* Consumes less bandwidth
* Shows progress-per-file
Main class for testing.
set icon using gtk-icon-theme-name
Removing .vim as a submodule.

As it's its own repo, and I frequently updated it, it was too
cumbersome to recommit my dotfiles repo as well. Just clone both.
Adding plugins to vim.
MDL-29733 grade: Query for Identifying Grade Grades to Precreate is SLOW
MDL-29733 grade: minor cleanup of some SQL and comments
don't point a link to page that needs a POST (bug 815433)
Add timer to destroy the process when it exceeds timeout threshold.
Also output '^D' (Ctrl-D) and End-of-transmission (ASCII 4) to the process's stdin.
[But this does not seem to have any effect.]
Fixed #else define
Merge pull request #335 from apathyboy/feature/python_shell

Fixed #else define
finishing up
deploying
Fixed wrong filename in setup.py
Fixed tooltip bug in accuracy/damage graphs
Fix some bugs (which only occur on my system??):
- Use default value for 'last' if it isn't set properly in navlinks (affects "Games" page)
- Use sequences instead of dictionaries in _query attribute for accuracy/damage graphs
Add "Favorite Weapon" field to player object and show on player-info page
(Works similar to "Favorite Map", i.e. count all the used weapons in recently played games)
Improved "favorite weapon" feature to actually work, and to show more than one weapon
The fav_weapon field now holds all the recently used weapons; the number of shown weapons can be set in the .mako file.
Also fixed the damage graph tooltips
Updated "favorite map" to show more than one map (three by default); and updated favorite weapon display
Implemented feature #1228:
Show weekly/monthly timer on the player_info page - http://dev.xonotic.org/issues/1228

Also added "suicides" to kill/death statistics (number only, no ratio)
Restructured player_info page to now include more detailed stats for specific gametypes (currently duel,dm,tdm,ctf)
The total_stats dictionary now also holds much more information than before, especially gametype-dependent info
Also added "favorite server" line, showing on which server the player is most likely to be found

This commit implements some of the suggestions from Feature Request #1039:
Organizing Player page statistics - http://dev.xonotic.org/issues/1039
Fixed some bugs in player_info page
Fixed some bugs in the latest commits (e.g. DB queries, website layout)
Went back to showing only one favorite map/weapon/server; rearranged layout somewhat
Rearranged game details to show up in a fancy table, one row per gametype
Rearranged layout of "game breakdown" section (currently WIP and not fully working)
Finalized "Game Breakdown" section (fixed implementation; added more data; improved layout)
Add relative number of games / playing time to game breakdown
Re-implemented the badges generator, now it uses the cairo API for rendering.
Rendering one image takes about 0.2 sec, including the DB queries for each player.
Fixed/improved some things in gen_badges.py (more colors, fixed playernick handling)
More fine-tuning of the badges generator
Fixed bug in "total wins" query - NOTE: other queries (e.g. duel wins) are still flawed!
Fix the header on the ranks page.

Consolidate the logic for the header, which was being neglected.
Now it has the full header present without an h2 which essentially
duplicated the same header. I removed the h2 and left the header.
Remove artificial padding on the body of the page, un-fix navbar.
add two numbers without using arithmetic operators
[KARAF-2057] Fix NOTICE and LICENSE files

git-svn-id: https://svn.apache.org/repos/asf/karaf/cave/trunk@1423448 13f79535-47bb-0310-9956-ffa450edef68
Materials and new world.
Win8: Moving directory structure
work with entities and json
cleared playground
Initial commit of new hall module, to get it working with the current devel branch.
Ongoing work to bring hall_module online, and have it be an interchangable module with latest OctoRoACH code.
Initial commit of sys_service module
Bug fixes for hall effect.
Hall python code initial.
Adding version python script, updating project files.
sysService module further development.
Carrying over some modifications from other branches for consistency.
Porting various modules to sys_service module.
Now working: legCtrl, steering, telem. Unresolved question about needing large data model to handle function pointers into module compiled with large data model.
Merge remote-tracking branch 'origin/hall_module' into hall+sys_merging

Conflicts:
	firmware/nbproject/Makefile-default.mk
	firmware/nbproject/Makefile-genesis.properties
	firmware/nbproject/configurations.xml
	firmware/source/cmd.c
	firmware/source/main.c
	lib/steering.c
	lib/telem.c
	python/experiment.py
porting hall module to use sys_service, working on python hall_experiment
Development of hall module and python code.
cleaning up hall python code
Fixed errors in sys_service with incorrect timers being configured.
Hall module compiling and funcitoning, not extensively tested. Hall telemetry not currently working.
Removing pyc files that should have been ignored.
Merge remote-tracking branch 'origin/hall+sys_merging' into devel

Conflicts:
	firmware/nbproject/Makefile-default.mk
	firmware/nbproject/Makefile-genesis.properties
	firmware/nbproject/configurations.xml
	firmware/source/cmd.c
	firmware/source/main.c
Authentication via twitter. Added unit tests, still working on finding and creating new users based on twitter id's
Prevent elibgit:start from being called
- Use portals instead of exits in go command.
- Let Character::go() accept Exit, Portal and Room pointers.
- Add movements test.
- Little cleanups.
add numpy sign function and clean up more tests
Rename remove_original_message to actual_message
Renaming NETagger directory to NEAnnotator
Deleting files becouse they have been moved around
Ignoring .snow files
splitting out feature extractors to different files
Committing files that have been moved around
Deleting msgid_stat.py
Split up the templates to extend a common base.
Switched to sqlite db and added styles.
Added information about used quota.
Created helper methods for accessing dropbox account. Used in a new AJAX method for getting space data.
Added a default suggestion for 'defaults'. Still needs configurator. #27
Fixed bug where a suggestion's example HTML/CSS/JS were not rendered correctly. Fixes #25
Merge branch 'master' of github.com:arthuracs/Coconut
scripts: Add support for the remaining languages to the install scripts.
Delay the "Starting Arx Libertatis ..." log line so that the version is included in the arx.log file.
Fixing get source
Fixed cast of restistance
Moved db server
fix user-md
Quick fix for bug with destroy()

The bug occurs with non-image elements.
During the process of setting up $origimg and $img,
$img is not cloned from $origimg, but instead simply
references it.
This results in a side effect of adding $origimg inside of
$div element, and as a result, destroying
the jcrop via jcrop_api.destroy() screws the
whole thing up.
Set selected attribute properly
List plan files more cleanly
Override list partial to hide action links
Include bootstrap responsive css
initial commit from srv1
bug fix in problem poll building
resolved conflict Assaf please avoid committing of pyc files
Merge branch 'master' of https://github.com/assafi/236501_hw1

Conflicts:
	src/sol/roadsTester.py
added gen-folder
change check for backend area.
strpos() check does not work for custom backend route. Ex.: mymoduleadmin_adminhtml_index_index
Merge pull request #8 from Luge/fixes

change check for backend area.
Fix LaTeX identifier
Added more tests
Simplify code
Make sure is_votable doesn't crash if passed input that is neither a filename nor a file object.
call it synopsis and append source to the description
[Completes #28028811] upon / any link
infinity with a vertical bar too
ExamplePresenter: display version info at startup
on-demand update check
we dont need to wait
0.2.3
Fix player caching
virt.virt_v2v_utils: Fix incorrect class calls

Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>
README no longer lies
Wait for writes to finish upon exiting RTC config

This fixes race condition when rtc_get_counter_val() call immediately follows
rtc_set_counter_val().
Added rcc.h include, needed for osc_t.
Support for exception handling in linker scripts.

This is needed even in plain C when 64 bit variable (e.g. long long int)
arithmetic is used. For example it is required when newlib is compiled with
--enable-newlib-io-long-long.

Conflicts:

	lib/stm32/f1/libopencm3_stm32f1.ld
	lib/stm32/f2/libopencm3_stm32f2.ld
Removed the load address statement from the .bss section.

Otherwise the linker will complain: "section has both a load address and
a load region"
Fixed the linker scripts to be the way Tomaz Solc proposed.

Something went wrong when cherrypicking his commits in the pull request.
Sorry about that. :(
Merge remote branch 'origin/master'
Added support for the SDIO interface of the stm32 family.
Register definition from the Datasheets; not tested in real hardware.
started include/lpc43xx with copy of lpc17xx
started gpio.h lpc43xx changes
Also unset BIDIOE in spi_set_unidirectional_mode().
finished gpio.h and memorymap.h changes for LPC43xx but still much to fill in
#include fix
new lib/lpc43xx, starting with copy of lpc17xx
gpio.c, vector.c updated for LPC43xx
updated linker script
typo fix
Makefile updates
semicolons might help
added lpc43xx to target list
renamed linker script
Removed  in favor of autoloading
Updated styling, code cleanup
位置情報添付についていろいろ修正

・usingGpsとusingNetworkをtrueにし忘れてた
・networkからも受信し続けるようにした
test list command
test list --reverse
admin html edit
replace immutable list with copyonwrite array list in the server spec
ajout du controlleur de Shop
ajout des vues de Shop
Use markerb for emails

* Add markerb to the Gemfile
* Update mailer classes to send multipart text+html emails
* Simplify all email templates and convert to Markdown+ERB

This required stripping the CSS and images from the emails. All
Markdown templates are based on the original HTML version except
for the inviter, where it was much easier to work with the text
version (and the i18n contains the whole message anyway).
remove debug_rjs reference
reorder so integration2 connects to correct redis port
Reshares delegate nsfw to the root post

fixes #3120
seperate and move redis dump files so they don't mess with installed redis
match integration pod ports
Merge pull request #3240 from pubis/update-federation-logger

Update federation logger
Merge pull request #3225 from stevenh512/refactor-emails

Use Markerb for emails
Merge pull request #3241 from stevenh512/nsfw-reshares

Reshares delegate nsfw to the root post
small typo in notifier.rb
DG MS; popup on services, inlined in the composer
fix email spec;  nokogiri needs a top-leve element
add title to service icons.  yay. [ci skip]
Fix new publisher if user is beta
Merge pull request #3245 from SuperTux88/fix-publisher-for-beta

Fix new publisher if user is beta
rescue update services on login

was failing in development
remove obnoxious box-shadow transition on hover; transition on transform [ci skip]
eagerly call isotope before images are loaded; optimistically assume wallpaper is in the cache until we actually fix the issue [ci skip]
defer the optimistic loading of profile wallpaper and title (at least wait until the call stack is emptied) [ci skip]
Merge branch 'master' into londondiaspora

Conflicts:
	Gemfile
Forward Check oldu gibi
Mise en place des tests
Mise en place des tests
Update js/slidemenu-1.0.js
Enable optimistic locking for community test 8
"`goto` is back, bye bye ugly `stepTo`"
"`goto` now accepts more types of parameters: numbers, id strings and DOM elements"
"`goto` now accepts duration parameter"
lowercase event names to keep DOM events convention, with backbone-style impress: namespace - in courtesy of @medikoo
only call enter and leave events when necessary
no need to delay transitions with `present` class
docs updated with recent changes
release 0.5
Merge branch 'master' into gh-pages
プラグイン一覧を表示する際、baser/plugins/ 内も確認するように変更
調整
Merge branch 'dev-2' of github.com:basercms/basercms into dev-2
ツールバーのCSSを調整
$baser->getContentsName() の仕様変更

* トップページの場合は、Homeを出力
* エラーの場合は、Errorを出力（404など）
パンくずナビのテンプレート名を変更

navi.ctp → crumbs.ctp
管理システムのパンくずのコードを調整

Warningが発生していたため
ページテンプレート読み込み処理を改善
ページテンプレート読み込み処理にてPHPの実行時間、メモリ設定を変更できれば変更する仕様にした
ツールバーにデバッグモードを表示するようにした
ツールバーのレイアウトを調整した
BaserAdminHelperを追加

今後、管理画面関連のヘルパ処理は、このクラスに追加していく
ユーザーグループごとに管理システムのグローバルメニューの表示を切り替えれるようにした。 fixes #2239
インストーラーの内部Warningや表示部分を調整
BaserHelper::getTitleで発生していたWarningを調整
BaserHelper クラスのプロパティのコメントヘッダを調整
BaserHelperのメソッド追加

BaserHelper::isPage() 固定ページ判定
BaserHelper::getHere() スマートURLやサブフォルダに依存しない現在のURLを取得する
BaserHelper::isCategoryTop() カテゴリのトップかどうかを判断する
update rebar to 2.0.0
Merge pull request #22 from basho/dip_rebar2.0

update rebar to 2.0.0
Revisão inicial

Código fonte inicial do projeto iPagar.
Merge branch 'master' of github.com:baxizzo/bungurere

Conflicts:
	grails-app/views/layouts/main.gsp
added google analytics plugin
added google analytics plugin
added google analytics plugin
Merge branch 'master' of github.com:baxizzo/bungurere

Conflicts:
	grails-app/views/search/results.gsp
Merge branch 'master' of github.com:baxizzo/bungurere
removed tags from being owned by agent
removed tags from being owned by agent
changed the way tags are added to item during add and update
changed the way tags are added to item during add and update
changed the way tags are added to item during add and update and restructured the UI to allow tags to be in pool and being select for an item
changed the look of search button
added new button look
changed the look of search button
Merge branch 'master' of github.com:baxizzo/bungurere
added locations.agent can have more than one location
added locations to item.item can have more than one location
description cityArea street set not to be null
set tags to be in a pool and not to be owned
enable agent to manage locations.agent can own location and then set them to item
removed mapping of google map from ItemController and put into LocationController
add public api to KSUser class
move functions to respective classes
Added nuget gallery links
Adding example with wget and build commands of how to incorporate metis and suitesparse
Reset to default notifications for testing

Signed-off-by: Ben Agricola <bagricola@squiz.co.uk>
upgraded apache commons io to version 2.4 - required by tools.export package

git-svn-id: https://specify.svn.sourceforge.net/svnroot/specify/trunk/Specify@10488 ce9bf4bf-376f-1848-a496-a1c9fe3b1a39
- reformatted code
- fixed newlines in Stacktraces
PROBCORE-145
made Global Variables View a bit prettier PROBCORE-137
fixed PROBCORE-131 created ESection enum
Add our custom homebrew formulas.
fix
Merge branch 'master' of github.com:benohara/dotfiles
Merge branch 'master' of github.com:benohara/dotfiles
Merge branch 'master' of github.com:benohara/dotfiles
Merge branch 'master' of github.com:benohara/dotfiles
Merge branch 'master' of github.com:benohara/dotfiles
Merge branch 'master' of github.com:benohara/dotfiles
Merge branch 'master' of github.com:benohara/dotfiles
Merge branch 'master' of github.com:benohara/dotfiles
Merge branch 'master' of github.com:benohara/dotfiles
Merge branch 'master' of github.com:benohara/dotfiles
Merge branch 'master' of github.com:benohara/dotfiles
Merge branch 'master' of github.com:benohara/dotfiles
Merge branch 'master' of github.com:benohara/dotfiles
Merge branch 'master' of github.com:benohara/dotfiles
fix
Merge branch 'master' of github.com:benohara/dotfiles
Merge branch 'master' of github.com:benxpo/projet_php
Corrected a bug with the Zip Upload
Add Python 3.3.
updated db reader with minor fixes
stm32: Implement some of inline.c
DHCP and DNS removed
next bus arrival feature added
stable version v0.7 yippee!
DHCP enabled
Touch sensor feature added
ht1632c library merged from http://code.google.com/p/ht1632c/ (commit a1953174a4ab)
Remove hasJSFrame test