labofsahil/github-event-dataset-2012 huggingface dataset:
add info about supported events to services.json
Add tenderapp.com as a service
Adding a master_only option, borrowing liberally from the Campfire version.
remove run_code_run docs :(
don't export github_payload as service documentation
Add test for the Tender service
Addition of live URL and trimming of input fields
Add service hook for Habitualist
Merge pull request #358 from calexicoz/master

Add Tender Support as a service (tenderapp.com)
merge
Merge pull request #366 from CodePorting/master

Addition of Live URL and input parameters trimming.
Merge pull request #367 from eldarion/master

Add a service hook for Habitualist
Merge branch 'master' of github.com:github/github-services
consistent spacing
Update of URL
Merge pull request #329 from rkh/supported_events

add info about supported events to services.json
Merge pull request #369 from CodePorting/master

Update for Live URL
removal of code to trim input fields
raise twitter errors
error key
Traduzido e Otimizado. npc/re/eventos/xmas.txt

Labels removidas;
Switch adicionado;
Otimização da estrutura do Script;
Tradução de acordo com os diálogos do bRO (Nome dos Monstros/Comentários/Diálogos);
do not do local_manifest.xml repos

Change-Id: Iad6b505725738d4b6cb008a639060e7ff1e21543
Update notes for submitted changes

* Support for more specific toolchain versions
remove dependency for i18n. Wrapper functions has been made for i18n functions
Merge pull request #1 from DanielLefevre/master

GUI added by the PGROU project.
Checks if every walls have been simplified before launching next step
Adds seventh step, without process and view but with check
Adds interfaces to easier gets buildings, ground, walls and roofs
Adds Edge from Recollage repository and corrects mistakes associated
Adds Points from Recollage repository and corrects mistakes associated
Adds Points from Recollage repository and corrects mistakes associated but makes the display BUGGING
Adds Mesh from Recollage repository and corrects mistakes associated
Adds Polygon from Recollage repository and corrects mistakes associated
Adds Surface from Recollage repository and creates new step 7 classes from step 6 without modifications yet
Adds Tests from Recollage repository
Adds Decimation and Recollage and ImpossibleProjectionException from Recollage repository.
Uses decimation and resticking methods in BuildingIsletStep6 but without removing debug tools
Style corrections.
Merge branch 'master' of github.com:Nantes1900/Nantes-1900

Conflicts:
	src/fr/nantes1900/models/islets/AbstractBuildingsIslet.java
	src/test/fr/nantes1900/models/EdgeTest.java
	src/test/fr/nantes1900/models/PointTest.java
	src/test/fr/nantes1900/models/TriangleTest.java
Adds modification from Recollage repo in model/basis classes and BuildingIsletStep6 methods
Merge branch 'master' of github.com:Nantes1900/Nantes-1900

Conflicts:
	src/fr/nantes1900/models/islets/steps/BuildingsIsletStep6.java
Bug resolved in the 6to7 step process.
Bug resolved in the display of the triangles.
Added the error calculator.
Added the decimation coefficient.
Updated few things in the step 7 (BuildingsIslet, Building, Controller,
Universe3DView).
Creates BuildingStep7 from BuildingStep6
adjusted layout + css
Merge branch 'master' of github.com:DartHackPrague/dart-music
Added clock face files updated for Katie.
Adjusted program for Katie's mask layout
Various changes
Made clock default to time of compilation.
Various changes incl updatting animation and setting time to compile time.
Code styles...
Merge branch 'katie'
Added auth check
Added integration tests for user and session controllers
Replaced everyauth with passport
Fixed authenticate method
Added session controller
Added user controller
BATE is Belorusian :p
Add pvr-addons
Switch to camel case and double quotes for consistency
Switching "dir" to "folder"... it sounds nicer
Recompiled stylesheets
Removing some test case files
igb: Per-device TX/RX descriptor count tunables
ifpoll: Adjust default parameters for 1000Mbps network
VFS accounting: use vq_vptomp() in kern_ftruncate()

* Getting the needed struct mp* from curthread is not a good idea,
  the chain of dependencies is complex and may cause problems.

* Use vq_vptomp() to get it from the vnode we're using instead.
Started using CDN, created a build script to concat & minify all js.
Merge branch 'master' of github.com:EightMedia/TwitterFontana
Tweaked README
Give modules mutexes to ensure each module has hooks called only one at a time
Add some useful user and computer functions, various fixes and enhancements

Add new user functions:
* Return a list of all users in AD search by samaccountname
  function all_users_samaccountname($include_desc = false, $search =
"*", $sorted = true, $filter = "")

* Set User Thumbnailphoto
  function user_set_thumbnailphoto($username,$imagestream)

* Unlock a user account
  function user_unlock($username)

Add new computer functions:
* Add a computer to a group
  function group_add_computer($group,$computer,$isGUID=false)

* Remove a computer from a group
  function group_del_computer($group,$computer,$isGUID=false)

* Return a list of all computers in AD
  function all_computers($include_desc = false, $search = "*", $sorted
= true)

* Obtain the computers's distinguished name based on their computerid
  function computer_dn($computername,$isGUID=false)

Other changes:
* @function user_create: remove needed email attribute, because is not
need to create a user account
* @function user_create: excape a comma seperated displayname to
prevent ldap errors
* @function all_users: add additional filter attribute. usefull if you
want to create filtered userlists
* @function contact_info: prevent error on empty memberof attribute
* @function adldap_schema: prevent errors if attribute is not set
* @function adldap_schema: add some missing attributes
correct working of sitemap/yml/robots/etc
Adding dialect to the DataSource config example
LogFile created
conveyer belt fix
Creation of classes for defining composite keys
The percentage is in the range [0,100]
Formatting Float with the  ###.## pattern
Bug correction : Do not display the end date calendar icon all the time
New filename for the diffs on Overgrowth's server.

Started on localization.
Update the Readme for 1.7
Removed unnecessary inline script.
shorten the delivery queue based on its max length
ROBUST now starts in detached REST console mode, console can be viewed through
"Manange Running Services".
Need to buffer output coming from processes
Need to make HTTP sender to talk to processes
Here is the Create user form for your programming pleasure. Bon apetit!
Add dependencies to readme
Merge branch 'deps' of git://github.com/jhance/GridToGo
Merge branch 'master' of git://github.com/AMasterOfFish/GridToGo
Fix memory problem in Led control (issue #1)

images will be flushed before there will be created new images. Also if the current value is the same as the one in the setter it won't be set at all because it's already set.
Emit only needed data in filesCountByUser view.
deleted herp.txt
クッキー情報をコンフィグファイルに書き出す処理を実装した
changed the way comments are assigned to text signatures
Merge pull request #22 from christianwach/master

reworked the way comments are assigned to text signatures
Filmselectie vandaag morgen en overmorgen toegevoegd op de homepagina. Komt nu uit de database. Plus een beetje refactoring.
UPDATE werkte niet in chrome.
Signed-off-by:Chivan <Chivan@Laptop-Chivan>
Uploading copy of honors repo files.
Fixed HelloWorld Xcode project
Lets use 2 workers currently and preload app
sort by least played on fast play mode
Changes to Game1 and GameObjects
Merge branch 'Tyler' of https://aladd04@github.com/JWengert/jw-asteroids-454.git into Andy

Conflicts:
	Asteroids.suo
	Asteroids/Asteroids/bin/x86/Debug/Asteroids.exe
	Asteroids/Asteroids/bin/x86/Debug/Asteroids.pdb
	Asteroids/Asteroids/obj/x86/Debug/Asteroids.exe
	Asteroids/Asteroids/obj/x86/Debug/Asteroids.pdb
add erlang/bin to path
Fix casing in jQuery-UI.html
Merge remote branch 'origin/master' into develop
Sandbox code cookie stays around across sessions
Refine definition of Control.iterator().
Start using quickui-pre.
Simplify tutorial examples to pass content to create() call.
Remove rehydrate plugin now that core runtime handles that.
Use <button> as tag for big button for tutorial.
Drop deprecated reference to CoffeeScript plugin.
Rename controlClass() properties, since Control.prototype now defines one.
Remove (old?) classes.html.
Document controlClass() and each().
Rename each() -> segments().
"id" -> "ref"
Remove built files.
Use classes instead of IDs for styling referenced elements.
Remove built files. Again. Not sure why these keep coming back.
AceCodeEditor needs an ID to work.
Update tutorial and docs to match changes in QuickUI 0.9.
Promote grunt.js to be project-wide build file.
Playing with new generic support.
Drop need for setting generic
Use new genericSupport facility.
Get class documentation working with new className and classes scheme.
Update tutorial's and docs' use of generic().
Start on page describing how to fill in base class properties.
clean up a little
Add a vaguely stressy test
Shift terminé
debut mp et fin updatemembre
increased number of RGB led's
Added test for deleting users
kinda working session support
Changed searchActivity layout identifier
添加[增益/衰减]切换按钮
Here are the errors
Improved the offset calculation
Merge branch 'develop' of github.com:MMS-Projects/channel-bots into develop
Fixed the server command
Now handling EOS.
Merge branch 'develop' of github.com:MMS-Projects/channel-bots into develop
Load elements

Am facut doar legatura intre ComponentComboListener si LayoutGUI
restored autotools path
Implemented BookCreator JUnit test and made some minor adjustments to TrackCreatorTest as well as BookCreator.
added Sony SDK
Merge branch 'master' of github.com:MathieuCalba/door-bootler
add se
unquote uris received by the medialibrary
little edits to tweet on index.html
Fix wrong delete 3rd party CustomDevices Resources assemblys (thanks mm1352000)
Reworked GFX and EPG colours for Default/Wide skins (darkend the overlays so that colours aren´t that bright) ;)
Fixed Last Update date so it won't show 1.1.0001 but current date.
More trivial improvements in class FontAssetCore
Ajout du déplacement du personage avec animation
Changed the height of the content

Changed the height of the content to take as much of the screen as
needed...
DLLs and Alglib included
Vypocet krokov pre ESL

Pridane do GPURenderera1 - znacne zhorsenie - thread divergence + glmem usage
vision 0.2
vision 0.2
vision 0.2
Modified book views to not show user, as each user has its own collection of books.  Modified book controller to show only the books in the user's collection and to create books as part of the user's collection.  Removed the duplicate notice in book show.
Rebuilt entire desktop app from ground up
Add pregnancy screener event template to core stub data. #2634
Fix event template to instrument mapping. #2634
Remove test.png reference.
Show test watermark in the background when in the test enviroment.
Remove commented out code.
adding release support for eggs
fixing bump syntax
updated api
Merge branch 'master' of https://github.com/NatashaMurashev/Hackawalk
Chat UI: Minor fix.

Forgot to include in last commit.
Refs #2255: TRIVIAL: Add rudder-passwords.conf as a conffile in the rudder-webapp debian package
Refs #2405 Ensure that jetty use the right JVM
dealt with file encoding problems
BACKLOG-389: mock grouper service; make integration tests work
Added RobotUILibrary
Merge branch 'master' of github.com:OrbotixInc/HACKATHON-APPS
oops, now I realize why nothing shows up

I really need to stop killing useful stuff
udpated submodule head
Do not strip the errors property.

Have the server deal with it.
Revert "[aml] fixed, remove bit vars, they are slow and size does not matter"

This reverts commit 3ab85f1ae8f89db78d8c32b39c47fbee13a67b73.
Plus* v3.0.0 Updates

Fix formatting in CHECKSUM.md5
Last commit removed guid stuff :P
MrHIDEn's Fixes

All credits goes to him/her
added opengraph actions to comment create and payment create
changed to use liquid extension instead of erb - since liquid is the language used in the locomotive cms
[FIX #65754] Affichage BO et Firefox 15.0
checkstyle tuning
checkstyle tunning
zmena
kosik deleted
slevy1x
zmena2
Session ID Problem solved
Added Xenoarchaeology shuttle, removed Roboticist's access from command-clearance Tech Storage
Fixed the lack of job alt-titles in Crew Manifest
Fixed typo and wrong colors for ribcage surgery messages.
Stuffing mobs in disposals was logged only when you did it via grab.
Now from dragging too.
Fixes healthy appendix spawning always, regardless of if mob had appendicitis or no.
Also possibly mobs did not get resistance to appendicitis.
Added Custom Item: Fountain Pen
Fixes issue #2001

Robots with mesons or x-ray now don't see the lighting gradients anymore.
Merge branch 'master' of github.com:Baystation12/Baystation12
Cryo now stops bleeding temporarily.

To be exact, low body temperature in general does.
Updated changelog.
Fix for cryo stopping bleeding.

Forgot that internal bleeding doesn't use drip()
Added Custom item: Lithium Flask
FIRST COMMIT YEY

-Fixed flooring under the airlock to the smes in Mining Research
Turned off space ninja spawning as a minievent
Merge pull request #2003 from CIB/master

Fixes
Merge pull request #2007 from SweeperM/master

Map Fix
Merge pull request #2000 from Whitellama/master

Map Fixes
Merge pull request #1975 from RavingManiac/master

Wrapping paper fixes and improvements
Merge pull request #2002 from SniperYeti/master

Added Custom Item- Fountain Pen and Lithium Flask
Added Engraved Zippo Lighter
Not allowing to save empty template(there by fixing bug) and some css changes on Login page
Merge branch 'master' of https://github.com/RazorPad/RazorPad.Website
add spec/dummy/tmp to ignore
add more coment for default_scope :join=>some_table
开始设计ArrayViewModel
Optionsmenu added to StartActivity
Merge branch 'master' of https://github.com/SENGMonster/SpagehttiCode
Fremdschluessel etc.
Fixed failed tests introduced by last commit
First version which should work but is way to slow
separated pythonsvg.py from processor.py in the script, so that pythonsvg.py can be simply imported raw
Prettyfied Server Informations
Merge branch 'master' of github.com:SpaceDev/SpaceBukkitPanel
Added check if bukget is down
Wrote shirt pages test. Started with shirt configurator
Wrote shirt pages test. Started with shirt configurator
Merge branch 'master' of github.com:Stefano1990/hemd-mit-stil

Conflicts:
	app/assets/stylesheets/custom.css.scss
	db/development.sqlite3
	db/test.sqlite3
merged most recent
x
Merge branch 'master' of https://github.com/StickmanLogic/GameJam2012
kleine änderung am schemaexporter
TinyMCE mixin schöner formatiert
Merge branch 'master' of git@github.com:SuperTux88/metacoder-blog.git
Add forbidden build
merge back in 200 batteries and the animations xml to go with them
Prettified league pages!
slide sass mixins
Preparar per egg v4.1.12
lager Endre appointment
Merge branch 'master' of https://haakonmo@github.com/Ullteppe/Fellesprosjektet.git
Refactor calls to disable GLShader_generic macros.

In tr_backend.cpp, a number of macros associated with gl_genericShader
were frequently disabled, so a public method was added to GLShader_generic
to simplify that task.
Add %age-required settings for change map, draw and admit defeat.

Cvars:
• g_mapVotesPercent (already used for layout change),
• g_drawVotesPercent,
• g_admitDefeatVotesPercent.

Initial setting is 50.
Allow admit-defeat votes to be disabled.
tarball.sh: don't throw away the GLSL optimiser.
removed all the unneeded registration templates
Simplified login/logout/index templates

As they were based on a base template that we don't want to use for now
(but we will add another one soon!)
Added the login/out urls conf wiring
Fixed the test fixtures that were causing failures

importantly we are now using natural keys for the content_type foreighn
key realtionship as we can't guarantee that the numeric fk's will always
map
configured the checklist to redirect to the

application view for the ethics appllication on completion
commit last5
commit last6
init Angular
RE: avatar
updating nginx version to latest stable
testing website deployment via hook
Placed coin/star in boxes Added AI's.
Added a koopa
Use hashes instead of strings
let sendmail use the current date and time
Ingress 스캐너 기술 사용하기 부분 메뉴 번역
Merge branch 'master' of github.com:Ziemowit/DziennikLekcyjny

Conflicts:
	Form1.cs
Fixed errors and alignment.
pretty fix 4
Core: cache file with store's settings renamed to "settings.store". cache cleaning for it changed.
Bugfix related with config_url setting parameter added.
Control Panel:  mail send added for customer approvment( save and quicksave)
Storefront: minor ui bugfix.
Fix address for bugreports sending.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
po/*.po: convert to UTF-8.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
(user_browse_dialog): port to GTK+2.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Inproved the README
Prob. example update
Update README
Update README and manual merge
changin search layout
add nodelet version pcl_extractor
add dynamic_reconfigure in pcl_extractor
validate.cssの再設置
Fixing keywords on live ebuild.
Adding shadow management.
Assorted progress...
depend on xbmc.python 2.1 for frodo only, update changelog
moved a few from dev to master
Update features, ctools, strongarm and token
exercise 2 is now working. the problem was that i didn't cast the (void) correctly, that the threads returned and i forgot the free the allocated memory. Also the pthread was right after the creation of a thread, thus stopping a new one from being created until the former was finished - rendering the program completely sequential. fixed that now and it shows in the output: while creation is more or less indetermined, the results will all be shown in the correct sequence
Terrier Fixed
Merge pull request #202 from andresmoschini/update-employees-info

Created a new migration that reads a file to update employees
Add absence class to domain
Include a slug generator

http://predicatet.blogspot.com.ar/2009/04/improved-c-slug-generator-or-how-to.html
Add a Absence Reason class and initial values
Add absences to employee and little fixes
Allow to edit employee absences
Working on absence reasons suggestions

TODO: migration is not working
Fix absence suggestions

* Fix absence reasons index
* Fix predefined absence reasons migration
no open letters
Added optional params feature
Initial commit
Change config.xml
Geneerinen DynaaminenTauluInterface valmis
imported openquake dir
let
flet
labels permits to functions to be aware of each other inside the same let-alike block
princ
code and data distinction, ' in front of a form and you have data, else you have a function ready to be evaluated.
nil
cons
car/cdr
cadr/cdar
minor formatting.
if and truthy/falsey value
basic cond
Ultima version de entidades y mejora de archivos de SQL
Ultima version de entidades y mejora de archivos de SQL
Ultima version de entidades y mejora de archivos de SQL
Mejoras en MVC url amigable
MbeController
Agregados 2 enumeradores
Estilos de la pagina
Agregado el logo de MBE
Correcciones menores
Added sum of largest factors
download & download-alt
And now I learn even more. This seems to be the right way to override onMeasure
Increment version: feature
(remove) Direct hooking of Citizens.
(add) Generic hook for the Player class name, defaults to exempt all non
CraftPlayer classes from checks.
fix ocnfig paths for hooks
fix: add setting super class checking from config
(add) Option to prevent adding hooks (only is effective if cncp has been
loaded already).
non beta !
Added CAS support to Nagios.
Version bump.
Update docs.
Missing :
Turn CASValidateServer into an attribute.
Merge pull request #2 from scottso/add_cas_sso

Add cas sso
ASI1230: Revert MOSI/MISO swap for revB h/w

For this to work on revB it requires cutting a trace on the PCB
BUG fixed in time series
for heroku assets
	modified:   Gemfile
	modified:   app/controllers/application_controller.rb
update gemfile lock wo sqlite
rating for entries
Add .gitignore.
Make precision a compile time option.
Remove the time scaling of the field. It doesn't seem to help at all.
Temporarily disable reading the potential from a file.
added max_x and max_y to limit space
Playing with pull-to-refresh function, not final, but refs #1142

git-svn-id: http://ios.svn.wordpress.org/trunk@3007 7d847f7c-ffe1-4a24-85be-b788d016d96a
Show the welcome view on iPad.

git-svn-id: http://ios.svn.wordpress.org/trunk@3008 7d847f7c-ffe1-4a24-85be-b788d016d96a
Moved AuthenticatedUser to login package

This way we can avoid pulling in ActivityInfoCore as
a dpendency of the login module, avoiding of several
megs of dupliated, unused resources from public/
Excluded GWT symbols maps from war

We are encountering errors in deploying to appengine
because of the 250+ megs of symbols maps that
we're not using.
Added an explicit installation of pyqcy for travis
Semi colon usage
Actions app now properly working on Analog
More cleaning up

- Cleaned up more code by removing unused code
- Implemented one more debugging function (show collisions)
- Misc. small fixes and tweaks
Ignoring Idea's settings
配置文章路径，第三篇博文！
fix syntax error in string
added notification list to header
v1.1 - added port, ehlo, timeout, debug output
Site updated at 2012-12-12 01:56:17 UTC
Getting ready for tracking
Updated blue dot
fixed /assets... paths for all media
Merge branch 'new-registration' of https://github.com/bradstrong/practiceUpdate into new-registration
testing loggin in prod
corrected homepage link
setup initial model, controller, and marionette app
Load jQuery with HTML
Add twitter bootstrap CSS and JavaScript
Add basic navbar with button for x-ray mode
Add buttons for viewing next- and prev- snapshots
Remove pygments-specific styles from TimelineStyle.css
Use prismjs default syntax highlighting theme

This theme seems to perform much better.
Also: gut pre and code styles from bootstrap.css
Add line numbers for prismjs syntax highlighting

Refactor logic for composing snapshots to remove unneeded intermediate
layers of abstraction
Set sensible default line-height for code snapshots

Addresses line highlighting bug in prismjs

Fixes #29
Remove support for pygments

Fixes #28
Output a revisions array for accession through JavaScript
Add revision sha as id value for timestamps
Force revisions to be strings for JavaScript array

- Remove unneeded print statement
- Remove unneeded code comments for blame parsing
Add toggleable xray controls and typeahead sha search

Fix navbar to top of document
Ensure navbar does not obscure typehead search results

Fixes #31
Add goToCommit() function for navigating to a given commit

- Refactor JavaScript to encapsulate all functions into a timeline
object
- Move the "revision" identifier to <td> elements in the HTML
Ensure SHA search is the full height of the navbar

Fixes #32
Add body padding for navbar

As per the navbar-fixed-top suggestions from twitter/bootstrap:
http://twitter.github.com/bootstrap/components.html#navbar

Fixes #33
Print short hash beneath date stamp

The short hash is the first 8 or so characters of the SHA
Add basic function for scrolling to a commit from search

Bug: Upon hitting "Go!", the document will scroll, but after several
seconds will return to the root commit.
Scroll to commit on SHA search form submit

Closes #27
fixing busted classpath and project files
Added Ad Hoc build configuration.
make including image dimensions in json string optional (for
better performance)
fix for rails 3.2
Merge branch 'master' of github.com:cerebroso/mustache_rails3
Ajustes na ordenação do DB
Update README.md

Terms and Conditions
Refactor FindNodeVisitor and fix some autocompletion bugs
fix proposals of member names
handle type occurrences
present packages as children of modules in flat explorer presentation
update jar
add note to readme about not running better_errors in production
Babak's changes.
render a 404 page instead of forwarding to old blog
add tmp/restart.txt for convenience of restarting server forked by pow
Cleanup and point to a better version
add some constant variable
Results Overview page: document RESULT objects instead of FAILURE objects.
ecl-reports.lisp - a script to generate ECL reports.
Merge branch 'dev'
Committing An almost complete load service.
Tweak title tier levels
Increment version to v1.0.27: underlay support, backup flag, private resource download link, secure flag fix, cloud_name param in API calls
Add Cloudinary.config_from_url to use CLOUDINARY_URL even if not from env
Support max_results in resource drilldown
Change delete_resources_by_prefix to match other signatures
Merge branch 'master' of github.com:cloudinary/cloudinary_gem
Fixed Bootstrap modal overflow issue in Chrome
removed .DS_Store from assign_taxonomy directory
Updated list of colaborators
networking ...
fix issue in hiding/showing form elements
Support HTTP method overrides

Allow method overrides through the X-HTTP-Method-Override header.

Fix a small issue in the test client output.
Add link to brainstorm to README.
Issue Number #1
CLOSED - task 1: start ui components project and mark as library 
https://github.com/corsc/AndroidUIComponents/issues/issue/1
Issue Number #2
OPEN - task 2: implement basic GroupedListView and visual test/example 
https://github.com/corsc/AndroidUIComponents/issues/issue/2

-this commit also completes more of the inital project setup
deleted default registry announcement file
Lion 5.3 Mail build
build: system updates to provide indivual projects with the ability to pubish independently, if needed
Upload do bar plot Anot x Publicacoes
Merge branch 'master' of https://github.com/danilomendonca/qos-at-soc
Add GPLv3 license text. Remove deprecated Android API calls.

Signed-off-by: Joel Peláez Jorge <joelpelaez@gmail.com>
Change format style. Add ScrollView to activity_main.xml

Signed-off-by: Joel Peláez Jorge <joelpelaez@gmail.com>
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/org/darksoft/android/randomgenerator/MainActivity.java
Fix Conflict MainActivity.java

Signed-off-by: Joel Peláez Jorge <joelpelaez@gmail.com>
Change config for Eclipse IDE

Signed-off-by: Joel Peláez Jorge <joelpelaez@gmail.com>
Merge branch 'develop'
Merge branch 'master' of ssh://github.com/darkmega0/randomgenerator
minor changes, and started a testing thing for libraries
Use consistent quoting

There was a random mix of single and double-quoted strings.  Given that
python makes no distinction between the two, I suggest that we default
to single-quoted strings unless we're specifically trying to facilitate
the use of single-quotes inside a string.
Lint
Import lint
Make agent forwarding the default
Add InstallCert
getPiece now returns GamePiece.OBSTACLE if coordinates outside of board.
(Rather than throwing a runtime exception.  This should make life easier for students.
Wolf: minor adjustment to eating time.
Tournament: remove setting of board size via command line (for now)
scenarios determine board size.
agregando archivo de pruebas desde terminal
Merge branch 'master' of github.com:deltaoscargolf/kaizenwork
eager load merchant with Region#live_deals

* fixes n+1 problem with this method
* also, added spec for this method
dememoize national region
allow opts for user find
fix a spec
add region association to subscription
force persisted in model associations
make it nilsafe
use helpful initalizer parameter
Merge branch 'prod-rel-dec19' into persistent-connections
fix python path of hosttools
additional tuple test
revert accidental commit of unfinished test
modified:   dcpu16-ASM/tools/FontTools.cs
modified:   dcpu16-ASM/Program.cs
Began adding comments.
Added Earth and Stars maps.
small commit 2
Add pre-process scripts for taxonomy assignmenty
Adding Travis CI to sloppy-queue-flow.
Fixed Issue #358
Updated _posts/inprogress/2012-09-01-special-issue.md
add latitude and longitude properties
don't override active when loading supply points from a location
Added feature of saving a complete new invoice. Need to add price total into record. Prices should remain the same as it were at the moment of invoice creation.
fix
Merge pull request #395 from AlTimin/master

AlTimin.Calendar
parallelSort
Merge branch 'master' of https://github.com/YuliaNikonova/fizteh-java-task
some fix
parallel Sort
calendar
calendar fix
some fix
fix pSort
fix sort
Merge pull request #240 from YuliaNikonova/master

ParallelSort + Calendar
Merged airport buildings

https://github.com/dmustanger/WC-PrivateHive/issues/5
Final review versions
added "server is listening on port" status message and default callback route
changed action url to /sandbox/upload
*sigh* new trawlers
Auswertungen begonnen
zip
Test fuer Externe
TestVersion
Aenderungen
Version  1020
Menufuehrung neu
Debugging
Gruppengesamt extra in Konfig
In Vorbereitung Auswertungen
Version 1021
Anzeige ob in Gesamt und Gruppe gezaehlt
Sonderzeichen in Ident Problem
Data1 und Data2 in Graph verschoben
64 Circles in Systemsteuerung
Neues Systemsteuerung
Config mit Actions
Aktionen bei bestimmten Leistungswerten
MYSQL Fehler behoben wenn keine Eintragungen in Konfig
Action mit Parameter
fixed waiting bug
set sensors via console input, some refactoring
this commit is segfaulting. will try to bisect.
cleaning up after segfault, started build table refactor.
Remove XHR event listeners again and properly
Count AC-XHR as other-bytes
Sandbox fixes
matrixpictures.net plugin
Make compatible with dta-3

Closes GH-56
New plugins: imagebunk, imgdepot
avoids enter key
adds audio
Handles when the admin left the game
Removes autocomplete from the word input
wip
Merge branch 'develop' of github.com:dperezrada/fast_word_game into audio
adds sound for winner
Only buy/sell in survival gamemode
fix providers (missing ')')
Correction bug avec mktime sur dm.net
- Externalisation du plugin serializeObject
- Possibilité de redimensionner la zone de texte des textes (=>Compression_X|Y)
Jenkins preparing for next release 1.0.5.
Price field fixed
Temporal account migrations added
Apparently everything is working properly
Support new Collection and new Folder by default

* Support new Collection (plone.app.collection) and
  new Folder (plone.app.folder) by default
Merge remote-tracking branch 'collective/master'
update link name for org listing
Initial Commit
I like Droid Sans
Add Tomorrow Night to safe themes list
Functions to open otb projects and generate ctags
Bump font size
Install Rspec Mode from ELPA
Clean up keybindings and remove unused ones.
Disable autosave files
Add Custom theme path to load path
Remove Non Packaged Rspec mode
Add extra directories to gitignore
SPARK Wizard tab logic
Kudos content. needs structuring.
Update BasicGame/src/model/WorldCreator.java

Actualització de so
no summary available
Muse
new version
new version
no summary available
I'll read through the changes made and leave comments where appropriate.
Sounds like a lot of overlap with CategoryCode?
Add an example hook for preserving textarea contents in the case of navigating away from the textarea page
no summary available
no summary available
no summary available
add a proper homepage for myself, with a few tips and links to favorite addons
update fix to truncate-lines nil
made css folder
tabed code
Signed-off-by: unknown <Ivar@IE.(none)>
added highlighted ships
added bot shooting system
Signed-off-by: unknown <Ivar@IE.(none)>
Update to latest rustc and zmq
[NOJIRA] Readme.md updates for installation instructions, including posix-spawn in gemfile to get foreman happy again
Merge pull request #55 from yuhunglin/NOJIRA5

[NOJIRA] Readme.md updates for installation instructions, including posix-spawn in gemfile to get foreman happy again
finish pointevent and kid unittests
msm: vidc: Avoid reconfig if EoS is received after SPS/PPS

After core init, there is a hang if the data buffers
are not sent to the core as the core is not responding
to the STOP command. With this commit, reconfig is
avoided and EoS done message is sent to the client.

CRs-Fixed: 360438
Signed-off-by: Saikumar Kondaparthi <saikumar@codeaurora.org>
(cherry picked from commit fcd8763cbf25679c999e363ac63e65a234e4192d)

Change-Id: Ib7a438742de113a97c6317a7420fdee15406bd4a
Signed-off-by: Srivalli Oguri <oguri@codeaurora.org>
small fix FB
Refactored seekmentorwithgivensubject into a more general class called
SeekUsersWithGivenSubject
Created a JUnit test for SeekUsersWithGivenSubject
Started on a new metode in SUWGS for getting all users that are mentors
finished with findMentors metode
Created the model MentorWithSubject and a test for this class
Set up basic package structure

The package file structure has been initialized to be loadable in LISP.
Function to set model state added

Function `set-model-state' introduced. This function sets the current pose (origin and orientation) of a model within gazebo with a certain identifier.
reviewed code, added some comments, added new extlinux.conf, chattr -i before removing old extlinux dir - installing bootloader phase
Office Converter workaround to allow one to specify an output file name
Alterado o README
Adicionado patterns e outras cosas mais
Reciclagem de variaveis e funcao de teste adicionada
Introduce JsonRefException

OK, this is quite ugly. This exception is unchecked... And it is only launched
from what is still the $ref keyword validator.

Anyway, this does the job for now and it only required temporarily getting rid
of one test, and modifying three others.

However, one test also mysteriouly fails only on full runs :/ Add FIXME
Add a setitem to _backends
Fail-safe JournalDetails rendering.

Let's not crash even when running on an older Redmine.
Fail-save Wiki diff rendering.

Should work even on older Redmine versions.
Merge branch 'master' of github.com:flowdock/redmine_flowdock
FLUID-4777: First pass at correcting tab order. Scrub-bar now between buttons, sliding and captions move correctly.
FLUID-4777: Fix positioning of scrub bar and captions
FLUID-4777: Fix positioning of button icons as font enlarges
Merge remote-tracking branch 'acheetham/FLUID-4777' into demo

* acheetham/FLUID-4777:
  FLUID-4777: Fix positioning of button icons as font enlarges
  FLUID-4777: Fix positioning of scrub bar and captions
  FLUID-4777: First pass at correcting tab order. Scrub-bar now between buttons, sliding and captions move correctly.
polished plus patterns

Signed-off-by: flyingdeath <flyingdeath@flyingdeath.com>
Meeting service implemented - DRAFT
Item11808: reverting perltidy



git-svn-id: http://svn.foswiki.org/trunk/EditChapterPlugin@14709 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item11267: partial revert of version string change

version 0.77 required for "modern perl version strings" was released in
2009, and older installations might not meet that requirement.  Rather
than force another dependency, use simple quoted strings for versions.

our Dependency.pm module should be able to cope, and this is forward
compatible to the version strings.

git-svn-id: http://svn.foswiki.org/branches/Release01x01/SpreadSheetPlugin@16007 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
corrected json syntax errorallow maxAge 0 in settings.json
Add badges and change title
Closes issue #569 to remove all JimStim References from the source code repository. Good riddance and may MegaSquirt never be a part of my life again.
Added "colorbox"
Update README
updated readme
README changes
README changes
added title
Fase de distribuicao da inteligencia artificial
init commit
init update
kohm tool
BLS took down text file from their FTP server  link a local copy
スペクトル幅を増やしてパストレ（ついでに直接光を明示的にサンプリング）
Initial commit
Set up guard and gemfile with pg db for heroku
Asset compile
Hmm
Removing ipad
Compiling
:
Stupid compiler
awdwa
Cleaned up Session test class
Move admin javascript code to separate file for cleanliness
Had to do separate commits because git is apparently not smart enough
Database dump (Postgres). Single table: cr_entry
Removed rss feed - going atom only
Added ATOM feed at /feed/
Improved index.html design
Fixed a screen size related problem for WP 7.
table Login debugged - registration works now
Removed CommunicationImpl
renewed css hover
add support to hercules
Merge branch 'jellybean' of https://github.com/gs2usr/android_vendor_pac into jellybean
Camelizing some names to fit CFN convention
Cleaning up cloud formation script
Keep with Magenta conventions for jar naming
Downgrade assembly plugin

Was clashing with play artifact plugin
Merge pull request #133 from guilhermeamorim/master

Ajustando funcao logic->checkin para gerar senha. Atualização nas tel…
some more syntax
Simplified gemspec.
Merge branch 'refs/heads/master' into ruby18

Conflicts:
	simple_postmark.gemspec
use Backbone for model and collection
draw arcs for each player's goal
switched from float to DecimalField
last CRUD bugfixes implemented
add sort function to tables
empmange
redirect to yahoo
Update perl/ItemStats.pl

small changes in written forms
added content to about me
fixed float with border-box
grammar fixes
added common questions
added time vocab
added trainer that can be added to tables
added learn mode to other tables
Add more informations in README
added octopress snippets for markdown files
added pullquote snippet
First go at adding clojure support
Small cleanups to clojure.snippet
Small fix of defmethod
Merge pull request #101 from torbjornvatn/master

Snippets for Clojure
Remove licenses since they're now in the global snippets
Add switch case and select statements
Merge pull request #102 from steveno/master

Update to falcon snippets
add one more snippet for junit 4 with @Test support.
Merge pull request #103 from leandromoreira/patch-1

add one more snippet for junit 4 with @Test support.
little refactoring over the test for junit4 and previous version
Merge pull request #105 from leandromoreira/patch-4

little refactoring over the test for junit4 and previous version
Added erlang fun snippet (anonymous function)
Added erlang try snippet with a catch-all
Added OTP gen_server template following normal conventions
Added OTP application template following normal conventions
Added OTP supervisor template following normal conventions
Merge pull request #106 from tormaroe/erlang

Erlang snippets
Fix mismatched closing tags for h3
image resize correct to max width 530
template 404 and 500
big vision document rough draft in progress
early logo sketches
Add sina weibo oauth v1 support
Add renren support
Анализ параметров для генератора
Template for Processing sketch ready - including the extra keywords etc needed to run sketches outside of Processing
Added docs to template
Added docs to template
shoe
Scrap that idea.
allow printout when run
clearer labelling + T1 and T2
Resolving #3
trailing whitespace
	modified:   admin/applicants.rb
bundle update gc
	modified:   Gemfile.lock
Implemented a Settings Dialog, almost all settings are working.
(Still missing: 'alert immediately' and 'disarm time' because the whole logic behind that isn't implemented yet)

Service still crashes on screen rotation. Quit gives Exception due to leaked Service.
leanKernel v0.2
fix lection date
XML 2.9.27
each entry has a main menu now
Inserta hipotesis
Fleshed out some more of the ManualEntry class
Merge remote-tracking branch 'upstream/master' into jp275
Merge pull request #278 from jaypoulz/jp275

Started Fleshing Out ManualEntry Class
partial work on debian/cmake build
Merge branch 'master' of github.com:italiangrid/org.glite.wms
Add count 748
add ranks for yunbiao
Updated 'path-finding' function for animations and tweaked other stuff. Moved LMP_Animate functions to LMP_Execute (it's getting big...)
Adds block option to check
Handle repeat builds/existing files
statistics tested
Use self.set_table_name on acts_as_archive method
Getting the mailer to work and setup the confirmable module within Devise; tested with mail catcher but have not created any custom code outside of altering the Devise confirmation process for email only signup
playing with visual appeal and a few ui things
Removed the validation requiring a user for an InvitationUser which allows them to be setup as guests without any login/authentication but who can have identifiable information available
Update Sublime text config
Put up temporary contact page.

finished part 4.
Updated readme.md
Removed ANSI colors from Makefile

- colors removed from Makefile since the Eclipse console doesn't support
ANSI colors.
msm_fb: display: fix incorrect MDP formats components unpack pattern

Many of MDP input formats don't have correct unpack pattern, so image
displayed on screen is not in the actual format set.

CRs-fixed: 339114,337040
Signed-off-by: Adrian Salido-Moreno <adrianm@codeaurora.org>
(cherry picked from commit c5638f898324df37e40e402d208b0e97337d536b)

Change-Id: I66a404db039502d0511cd3d7dc34e81c0eca1d61
Signed-off-by: Gopal G Goberu <ggober@codeaurora.org>
Signed-off-by: Adrian Salido-Moreno <adrianm@codeaurora.org>
msm: rotator: provide dst format based on src format (squashed commit)

We must apply the changes from upstream manually since the source file is
located at drivers/video/msm/ instead of drivers/char/.
msm: rotator: move the source to drivers/char/ as upstream did
msm_fb: update headers to match with new QCOM libs
found solution for IE9
Tweaked IIS web site name.
Backport zram from CM 2.6.37.6 kernel

Remove deprecated ramzswap
Fixed remove links
bugfix: avoid unexpected changes of build-in tables
delete ONLY in t/014-bugs.t
adding deployment scripts and config files
Versión básica del cliente sobre el recurso pon
Restored references in appview footer
Adding savestate version check when opening savestates.

Fix for wiimote playback when the gcpad has been recorded.

Writing OSD messages to logmanager too.
Adding option to load state by mtime.
Load last state is expanded to 8 actions, for newest to oldest state.
A new action is to overwrite the oldest state (or use an empty slot if available).
The code to wait for a save to be written is necessary, the alternative would be to keep track of files in queue to be saved which would be unnecessarily complex.

Adding remaining hardcoded state keys to hotkey dialog.

Adding a program exit hotkey.
Removing of Backend..
fixed bz rotate
first commit
maybe now
i think
big commit
please work
please
please
please
Hope this works
stuff
stuff
free
x
yup
last
Merge branch 'gh-pages'
Merge branch 'gh-pages' of github.com:johnplank211/mdv-projects into gh-pages
Fix index.html form to point to feedback.php

fix typo in feedback.php
Add in dirty hack to transform a halfslab into a complete block on punch
Procfile for heroku
Switch to postgres, change column names. Rm unused proposal_view.html template.
1202 | Kavitha/Subhas | Implemented feedback 2, make URL mandatory
1202 | Subhas/Kavitha | Fixed feedback 1 - error not cleared when android suggestions enabled
1202 | Yekkanti/Jeyakar | Added scroll view for login activity
PART-I
Test slashless under 1.2.
First run at a 1.2 compatible HttpRequest.
marks and sparks nearly done
add 20-class twentynewsgroup example
try to break it to run on anything
added gravatar, created profile page
"xyz", not "xyx".  Not that it really matters.
Just use "ugly" URLs on search results pagination.  Until we can find a solution that works both with multi-word search and searches that have additional query args, stick with the default.
First pass at the Featured Header extension.
hw24 done
remove index of submodules
Cease syncrhonously merging changes into main context
Chagnes to the homepage, added more youtube videos to left hand sidbar ..I hope
First pass at a simplified 'Incremental' type, ways of feeding input.

Not exactly iteratees, but playing around with some of the same
concepts that they try to deal with. The 'pure1' main module could
use a few more examples.
Added a .gitignore file.
Merge pull request #96 from john2x/imaging

Draft for PIL in new imaging section under Scenarios.
fixed problems-tag sytle
1) updated SuperSocket
2) renamed method SendJsonMessageResponse to SendJsonMessage
Remove .nojekyll and use configuration of Maven site plugin
Spell loader.  Should be completely implemented, hopefully it works.  I
haven't tested it.  Also made an improvement to the SpellManager, making
it instead use the name of the class.  We should consider added in a
name field to spells.
Reverted Changes to SpellManager
Removed SpellSender
Fixed RetentionPolicy of Load.
Fixed the spells directory in SpellLoader.
Fixed ClassLoading.
Removed debug code.
Merge pull request #40 from evilmidget38/master

Spell Loader.  Addresses issue #37
reformatted main, AND/ORS work in execute, fixed OR lookahead bug in read
Add call to get hypervisor statistics

Adds an admin API call to retrieve the compute node statistics for an
entire nova instance.  Counts up all hypervisors and sums all their
values (vcpus, vcpus_used, etc.).

Change-Id: I0a3df235282089f1313d08ae5b89dadbd1db9840
The network retrevial portion of getting the active playlist is working.
But the actually setting of the playlist in the database only half
works.
fixes to website

Signed-off-by: Kenneth Willes <klwilles@southern.edu>
no need to hide
Increased DSF RAM to 8MB
Add placing on corners and methodize handling empty inv.
compile IConv module using glibc iconv (on Linux)
adding cstyle package
Merge branch 'master' of github.com:konoha-project/minikonoha
refactoring kStmt in sugar.h
adding break, continue in cstyle
tested import2
renaming SingleQuotedString with SingleQuotedChar
moving C style syntax to cstyle package..
who wrote this?
moving C style syntax to cstyle package..
refactoring konoha.int
Remove the old email mimetype setup (the new one works) and try to get the plaintext straight
refactored to use seperate translator class and service
removed some bulk
added isNew setter
added findOne() method
found objects will no longer receive isNew=true, but isNew=false
added functionality to write the same error to all properties, or just a specific property
improved the unique check
this will now also check existing records for modifications and conflicts
replaced $this->model->addError() with $this->error()
Consolidate AUTO_LINK_USERNAMES* and EXTRACT_MENTIONS into VALID_MENTION_OR_LIST. Rename AUTO_LINK_HASHTAG* into VALID_HASHTAG*. Remove com.twitter.regex.Spaces.
Allow Japanese Ditto mark and Turkish 'i' in hashtag.
Upgraded to the latest conformance suite
Do not allow ASCII number after TLD.
Upgraded to the latest conformance suite
refactoring Extractor.Entity and Autolink.
Add 'extractURLWithoutProtocol' option in Extractor.
Store MatchResult in Entity.
Bug fix.
Merge branch 'refactor_regex' into punct_before_url

Conflicts:
	src/com/twitter/Autolink.java
	src/com/twitter/Extractor.java
More bug fix, and performance improvement by scanning character before applying Regex.
Allow more punctuation characters like '.' or '!' to appear before URL.
Refactor Extractor.Entity. Implement simple escapeHTML() in Autolink.
Allow '_' before URL.
Implement extractMentionsOrListsWithIndices().
Merge branch 'master' of github.com:twitter/twitter-text-java into punct_before_url

Conflicts:
	src/com/twitter/Autolink.java
Modify the scope of jyaml dependency into test.
Remove Autolink.split() as it's no longer used.
Make 'RT' before @mention case-insensitive.
Rename Extractor.extractEntities() to extractEntitiesWithIndices().
数字合わせ用アイコン画像追加
レイアウトファイル作成
added in announce command.
travis bot testing for plugin
Added patterns of rspec conversion.
Added conversion for self made matcher.
Added self defined dsl file as the target of rspec conversion.
Adding a CC fallback for other gens
Adding a force join of mafia tutoring
reverting to jira's base_url
adding a get_logs command
Merge branch 'master' of github.com:lamperi/po-server-goodies
added integrity rule, remove minimodding from tour rules
Fix /ranking for multi tiers.
Implementing ignores for protect and safeguard. Because someone just may need a character who cannot be protected or safeguarded.
Fix Hobo's commit again.
bugfixes simulator
stopstreamtest eruit
Merge branch 'nieuw' of https://github.com/lannoysamuel/penoteamgeel.git into nieuw
lichtsensorruis aangepast
Merge branch 'werkend' of https://github.com/lannoysamuel/penoteamgeel.git into werkend
adding persian and balochi
updated buyer -> :success view
Invert return value of play(Field*)

The previous value required threads to invert the return value to count
wins. This way, simply summing the return values will give the number of
wins. And this will lead itself nicely to an ANP implementation.
Finalizado o Trabalho3
Add controller 'main'