labofsahil/github-event-dataset-2012 huggingface dataset:
Fixes the problem the ESF Pattern management screen only showed 8 characters.

This problem was reported as (part of) Projectplace issue 143.
Uses 'ESF patroon' instead of 'pattern' in the ESF Pattern management screen

This problem was reported as (part of) Projectplace issue 143.
Updates CHANGES.rst to prepare for a release
Translates other English terms related to the ESF pattern management screen

This problem was reported as (part of) Projectplace issue 143.
Updates CHANGES.rst to prepare for a release
Corrects a writing error in CHANGES.rst
Preparing release 1.23
Back to development: 1.24
Updated json
Merge branch 'master' of github.com:lizardsystem/lizard-serious
Reorganized script file layout to allow for local custom scripts not to be stored in the repo.
go!

Signed-off-by: Luca Degasperi <me@lucadegasperi.com>
admin Devise
Merge remote-tracking branch 'origin/master' into pat
Remove private nbproject files
Ignore private nbproject files
Add WordTable.containsArticle; make WordTable non-abstract
Merge branch 'master' into pat
Implement table model and some GUI boilerplate
Separate article table from window implementation
Put article table in a scroll pane in a tabbed pane
Add status panel to articles tab
Merge branch 'master' into pat

Conflicts:
	nbproject/private/private.xml
Limit window status panel height
Merge branch 'master' into pat
Merge remote-tracking branch 'origin/master' into marit
Comment-out problematic line on outdated test

 - It's a bit of a hassle to update WordScreenerTest with the
   newer changes in WordScreener. Comment out a problematic line,
   allowing the other tests to run.
updated README added credits
finish test for librarian page
Merge branch 'Vinh_work'

Conflicts:
	app/views/books/index.haml
fix vinh's bug in before filter
fix some bugs
Online-only promotions
Make a basic User model
Update Regular Expression
Implement Fast clustering using CD-HIT
Lower optimization level (for now)
updated versions for Gaudi v23r5

From: Marco Clemencic <marco.clemencic@cern.ch>


git-svn-id: file:///afs/cern.ch/work/b/binet/dev/repos/gaudi-svn-mirror/Gaudi/trunk/GaudiAlg@7090 22b0f739-a4da-4a50-9948-337547c35a65
changed to framework 4.0
Signed-off-by: Manjusha <manjusha@qburst.com>
Merge branch 'master' into production
Add basic readme.txt file for WordPress.org
Updated readme for better verbiage
make compile on Windows, do not require x11

can now be compiled on Windows (CMakeFile not supplied), but gnuplot feature has to be deactivated manually in the source code
doesn't require x11 on Unix / Mac any more for gnuplotting
Auswertung eintragen
2012-08-30 [mones]	0.9.2cvs3

	* src/poppler_viewer.c
		Don't depend on deprecated private includes
Blog Admin page save and delete working.
dammit chris
use current directory instead of home
synced to osops-utils 1.0.3 from rcbops
synced to osops-utils 1.0.3 from rcbops
ignore checksums
initial glance support
- adjusted test
Fixed comments Alexander
Removing old video-js.css
liq| as|: add xml output
liq|: +liqShader - step 9. update AETemplate UI. path(for appleseed, lux)
liq|: +liqShader - step10. test AS materials. (bsdfmix_physicalSS, lambertianBRDF_physicalSS, specularBRDF_physicalSS)
Update 1.2/starling/src/starling/text/TextField.as
works for pdfs and idml, I don't need more functionality at the moment
patch for belkin.
MakeFile Created, and g++ compatiblity satisfied
Add instructions for Java and Go App Engine apps
Merge pull request #26 from ImJasonH/patch-2

Add instructions for Java and Go App Engine apps
updates regarding the images of documentaion section
Formulae directory
Rocket
let transform return distance, too
Corrected silly typo.

Changed "diraction" to "direction".
Fixed another typo

Changed "destory" to "destroy"
Swipe events were being fired when the transformer was transforming fast.
Merge pull request #90 from michaelpaulson-wf/swipe_fix

Transforming -> swipe
Merge pull request #88 from seutje/patch-1

Correct silly typo.
Merge pull request #83 from Gottox/master

transform should contain distance[XY] too.
Created a view for account listing.

Added a generic view and a paginated listing of accounts. Haven't added a pager yet.
approve/reject emails at store update; store_creation email after create
Merge branch 'master' of https://github.com/mikesea/son_of_store_engine into store_confirmation_mailer
Merge pull request #35 from mikesea/store_confirmation_mailer

Store confirmation mailer
Start fleshing out Groups API, with some tweaks to the model interfaces.
Add Snow Leopard Terminal.app
Translation to Spanish Traditional (Spain)

Full translation of Automat:ee language file to Spanish. File saved as
UTF-8
Merge pull request #1 from pseudoclass/master

Translation of Automat:ee into Spanish Traditional (Spain)
Script engine updated
Лехин второй стресс
new avatar size
add avatar functionality
Vagrantfile errors
redirect to show action after auth, order users by newest

if post contains more than one hyphenated tag, don't show post more
than once, added unique ids to checkboxes, added check all button,
added description to home, updated readme
Fix a unittest race condition.
resolve upload.html conflict
Saving the first week's deployed content.
Took update text out of header in updates.
added stock animation
Do work. Get money.
setup table install script
wrtseqfile
rm license in readme
protobuf
up to v0.2.0
Merge pull request #5 from Quantisan/master

Writable seqfile and protobuf taps
Non-logging updates.
Set server log_level.
file observer debug
Testing tweaks.
Merge branch 'dev' of github.com:OpenMDAO/OpenMDAO-Framework into bug

Conflicts:
	openmdao.gui/src/openmdao/gui/projdirfactory.py
Cleanup cloned logging environment
Logging for forked remote clients.
Logging for non-forked servers.
Merge branch 'dev' of github.com:OpenMDAO/OpenMDAO-Framework into bug
Remove projdirfactory debug logging.
Merge pull request #1032 from setowns1/bug

Distributed logging
Fixed a typo in IterateUntil.start_iteration.  self.iterations should be self.iteration.
Remote logging fix for Python2.6
Merge branch 'dev' of github.com:OpenMDAO/OpenMDAO-Framework into bug
Merge pull request #1033 from setowns1/bug

Remote logging fix for Python2.6
!$%^& Windows
Merge pull request #1034 from setowns1/bug

Remote logging fix for Windows
interim commit
forgot to init the secrets data bags
applying .to_hash method on contents in config provider
Add Geany repos
ch7 ex4 max_list
del_substr.c -- ch6 ex2
Basic login command implemented.

Added an authentication step just before the handshake step.
If the server disconnects before the handshake is completed, it is interpreted as an authentification failure.
Authenticaton done

Added user name and password settings
Added an authentication dialog, which is called on authentication failure
Http authentication
Merge commit '59de8e48e552f78d72920588955a74b803b4a71e' into actionbar

Conflicts:
	res/values-da/strings.xml
	res/values/strings.xml
Position options & Copy

9 position options
Simple copy for example.html and cookiepolicy.html
block region alignment fixes
closer, but still a pile of suck
Add a version number to challenges for futureproofitude
[backend] implement blocking for products with remote projects
Update notes for submitted changes

* Adds /docblitz/ to the redirects to trunk.
Add infowindows to poly's
Started on home page design.
Sprint 2 Update
Dimension check removed when calulcating probability using pointers
Validates in php
Prefix the column name with the table name to prevent ambiguous select statements
Remove trailing whitespace
Merge branch 'master' of https://github.com/pathable/bitmask_attributes into scope-attribute-to-table

Conflicts:
	lib/bitmask_attributes/definition.rb

Signed-off-by: Peter T. Brown <peter@flippyhead.com>
Teste de configuração de projeto simples
Fixes minor display issues with .icon-only style.
Improves how .links behave by cleaning up the CSS and enlarging the clickable area through JS.
Fixes message icons not showing up in the correct position.
Adds $.pageThumbnails prototype.
Force the CMS LESS compiler to be in production mode all the time so that its caching is more effective.
Moves the object message to be within the widget instead of being outside.
Converts misc/siteMap.jsp to the newer ToolPage model.
Adds non-escaping version of typeLabel and objectLabel in ToolPageContext for ToolPage changes.
Changes ImageTag to append a closing tag if the tagName isn't img.
finished Machiavelli
Added the fialing URL we fetch
add test for bad form numbers
add maven feature
add logics and tests
Added Nov Meetup in NY
meta_pivotal_specifics: +flycut, +function_keys, sorted
adding search and other stuff
Deleted some precision errors - looks  better now when friends are clumbed up
Added postToWall to goal Accomplishment
Adding advance features
think Ive fixed some things
added map to choose an iparade page
add textarea y submit que no esta bien en mensajes recibidos por js, add imagenes de icono en color negro
Things basically working
More featuers
Add readme
Seems to work fine for me? Detailed repro steps Steven?
Fixed bug that prevented plot conditions from being created
Merge branch 'master' of git@github.com:raphaeldisanto/ScriptWriter.git
Add a check for nil
Add OSVDB-83822
Merge branch 'webpagetest' of https://github.com/wchen-r7/metasploit-framework into wchen-r7-webpagetest
adds rudimentary validity checking to pids for meterp kill

addresses redmine https://dev.metasploit.com/redmine/issues/7223, but
may not be a truly encompassing solution.  'good bandaid' as egypt put
it
Merge branch 'rapid7' into kernelsmith-RM7223-meterp-kill
updated App to use libpd's new C++ messaging abilities - deque.
updated version of libpd (now containing C++ in master branch)
add deserialize and separator config options
document 1.0.0 changes
good tracking
good tracking
田中翔平。自己紹介
kemo chairs in caer corwell int
topo files used for dart simulations
singleton na service de correcao de lancamentos duplicados
Minor renaming of variable
Adding composer.phar file
git ignore from github
prepare blank application
Rebase from 'release/calibration_launch' @ version '0.9.12'
Generated debian files for oneiric
Rebase from 'release/calibration' @ version '0.9.16'
Generated debian files for precise
Rebase from 'release/visualization_msgs' @ version '1.9.8'
Generated debian files for oneiric
Trimmed the branch to only the rostime sub directory
Increment version to 23.0.0 in config.php
release 24.0.0
Merge branch 'develop'
Block invalid CSV files with wrong number of rows per column
https://code.google.com/p/forceworkbench/issues/detail?id=585
close CSV file before throwing exception
create fields object on currRecord before setting value

fixes https://code.google.com/p/forceworkbench/issues/detail?id=586
add new instances: cs16/17 and eu2
move oauthlogo into static-unversioned
increase width of oauthlogo
update version history for 24.0.0 Beta 1
exclude log files from distro
Change REST Explorer url Up button for /id to reset the url
Fix Issue 550:	REST Explorer insturementation breaking debug footer
25.0.1 Beta 22 - rest explorer async and friends
update version history for 25.0.1 Beta
Updated .gitignore class.
Work in progress with a keystore.
Add a keystore, which wraps a private key.

Also, a command line, which can be used to generate a keystore, save it
local and show the public key.
login working on the surface.
Enable and fix kexec syscall support.

Use mem_text_write_kernel_word when assigning reboot_code_buffer parameters
to avoid protection faults (writes to read-only kernel memory) when
CONFIG_STRICT_MEMORY_RWX is enabled.
Support copying of kernel tagged list (atags) in the
 decompressor.

This is needed to hardboot kexec a kernel with a new tags list (including a
new kernel command line), since the new atags would otherwise be lost with
the limited kernel memory mapping.  Without this patch, a hardboot-kexec'd
kernel uses the atags provided by the bootloader.
Support hard booting to a kexec kernel.

See KEXEC_HARDBOOT config option help for details.
Reboot with the recovery kernel when kexec hard booting.
Merge pull request #10 from HomuHomu/android-linux-3.0-master

hard booting
functions now callable from parsed xml!
Works more in PHP 4
Testing for $system->getMemberStats();
Merge branch 'master' of ssh://github.com/satyamag/ProjectKentRidgeV4
Adds rake task for pull request stats

This commit adds a pull request to gather stats on
a count off all open pull requests for all projects.
$verbose should not be quoted
Merge pull request #87 from dizz/patch-2

$verbose should not be quoted
Enable floating IP on all-in-one setup
Make public urls use public_address in all-in-one

The public url endpoints currently use 127.0.0.1 for their hostname, so
it's impossible to use the all-in-one cloud from outside the host.
Change this to public_address so that it can be tested from the outside.
Merge pull request #89 from sorenh/public_address_endpoints

Make public urls use public_address in all-in-one
Merge pull request #88 from branan/cleanups_for_testing

Cleanups for testing
Merge pull request #84 from bodepd/add_pull_request_stat_task

Adds rake task for pull request stats
For Issue #73:
* Rename MetacelloConfigTemplate>>projectAttributes to #customProjectAttributes like 1.0-beta.32 per Dale's suggestion (See https://github.com/dalehenrich/metacello-work/pull/75#commitcomment-1572239)
added section for the mvn android packaged and (minor update) bash script tags to code blocks
Tickets initial
Added comments to exercises as text_field
working on tests
Fix
Fix filename error
conectivos3
make it release ready - makefile, manifest, license
Adding support files for various sketches
added fileSubsasgn for oMatCon
Multi-lang text fix
Add offline_access to default fb perms

[Deliver #26238407]
Added ITs for indexer subsystem, it does not go remotely anymore
net: wireless: bcm4325: Convert kmalloc() + bzero() to kzalloc() (franciscofranco)
Fix memory leaks from the wifi drivers (franciscofranco)
power-supply: Limit the duration of psy_changed wakelocks
change Makefile flags
Export HOME environment
LEGEND-37: slideshow timer disabled on iPhone devices
Add and remove workers dynamically
Added a link to multistage configuratin
Merge pull request #37 from nhoffmann/master

Added a link to multistage configuration
- Backup : Incompletegit add .
Integrated social media icons.
updated schema file
Merge branch 'master' of github.com:spacez320/gaiahouse_website
adding an easter egg opportunity. do applicants read commit history?
Cleanup code requiring
Add attachement for datatables
moved s3 regions
move from thin to unicorn
fixed handle no xhr to skip exports without prompts
added concurrent download management for exports
changed unicorn config
changed form and show views to two column layout
added threaded import
moved assets to s3
nevermind screw s3 assets
added select menu for terms
removed deleted files
Added useful files and such
Cleanup
user shorten counts
Added inclusion of clients.inc.php, made it so that the list of client planrooms is obtained from it
Added beginning framework for a single-instance locking system
Made while loop skip entries in /efs/ that are files
Added identifier: 'uuid' to all models to get them to work in 2.0.1.1
Merge branch 'st2011'
Fixed edit single percentage test.
Fixed height calculation of notes editor.
Made models and stores defined in the callback to IO init.
fix whitespace in template
allow login w/ google profile
use user object instead of specific twitter
unify /auth interfaces for twitter & google
identify user with type-attribute
use generic user-data instead of specific twitter-data
make client and server command line commands
Partial implementation of myproxy integration
Auto-detect Python2.7
First working version of logon interface with tests that demonstrate it's use.
Merge branch 'logon' into devel
Commit after adding The Eagle theme and initial work on template design
made database file
Merge branch 'master' of github.com:stuycs-ml7/pd7-miniproject1
Updated install doc to include installation from requirements/compiled.txt
class library: reformat ScIDE.sc with scide's indentation

Signed-off-by: Tim Blechmann <tim@klingt.org>
scide: provide Main::evaluateCode shortcut

Signed-off-by: Tim Blechmann <tim@klingt.org>
scide: change shortcut for opening definition to Ctrl+I

Signed-off-by: Tim Blechmann <tim@klingt.org>
Cleaned up for easier pull request
added certificate auth logic
apparently this needs eventlet
tilføjet SerialSTK
robots.txtを設置
Merge branch 'master' of github.com:tanatana/the-timeline-times into devel
UIを刷新
up to date
Merge branch 'master' of github.com:tarunvijayvargiya/gopuppygo
better exception handling around deleting existing dataset
fixed typoes
post merge cleanup
modified assignment instructions
Remove empty line on readme
only serialize the meta data, not the body
Add a message to know if request status was cached
Fix error when file not exists
DEN VIRKER NU!
added my bt speakers to asound
smbc launcher
more info on concatenation, and start of equations
Moving styles into folder structure that is easier to import
Adds base styles controller
add bashrc
add the most important aliases from my config repo to an aliases file, and link to it in the bashrc
Update page.php

I seriously forgot to add styling to this template file? Oh well... :-). Updated the file with default formatting along with a selectable sidebar option.
Tweaked the show/hide to be a little nicer.
Move to 1.54
Bump version
changes for actual push
changes for rewriting crosslinks
fix for firmware install path, since the module checks in the rtlwifi directory, not directly in /lib/firmware
Add the description for Bootswatch
Added stuff to 6.3
mmm last bit of duplication to refactor here
Make guide main readme
Add license to guide
Added support for multiple dependencies.
Fixed "continue" issue when restarting processes on failure.
Merge branch 'release/0.0.8' into develop
fix bugs with partial/layout fiel extentions
increment version number
Merge branch 'release/0.0.9'
changed config
fix #117 you can now view the logs by going to /production/assembly.logs/
- text pod fix removal
boilerplate html5
markup and styling
Merge branch 'master' of github.com:trillocity/colinpilloud.com
Controller now running on actual robot
Merge branch 'master' of https://github.com/troyastorino/brass-rat-pack
Add W3Jets_madgraph to datadefs
studview
Fixed small-screen version of PG Life homepage.
getting login/logout forms to display correctly, more content for home page only.
modified schema; deleted initial readme
added structure for php
implemented __init__ files for FNFoundation
added structure for php
implemented __init__ files for FNFoundation
[VOV-644] Removing the extraraneous step parameter on the show page
Archivists should see all unpublished items in search results
index html navigation, Todo: fix aside navigation
index, aside fix
Downgrading sugar
Updated shell script for peoplesoft-biztalk harvester to remove
directories that were preventing additions and subtractions from working
properly. Also removed testing statements from Diff.java as we resolved
our issue
Coins add life
formatting and updating plugin header comments
Basic flot plot of class duration complete
Merge branch 'master' of github.com:vyder/flot-philosophy-plots
Updated Readme
* Concise code for rearrange odd before even problem and raise a similar
harder unsolved problem.
+ A real asked interview question from axxxxx.cn
Don't auto-require rvm/capistrano

Call "require 'rvm/capistrano'" from capistrano recipes instead of
"require 'rvm-capistrano'".  This fixes an issue when the rvm-capistrano
gem is included via Bundler.setup.

Fixes #2.
Merge pull request #3 from blt04/bundle-require

Don't auto-require rvm/capistrano
updated colnames

made updates to eliminate redundancies and/or spaces in the column name.
Needs some work still. Need to keep updated with metadata .docx file.
Updated Schlesinger1997

Up to comm 471, in process of adding beetle family data and dbl checking
abundances.
Fix potential security vector in emptiness check

- Fixes a similar security vector to those fixed in previous commits,
  instead caused by scalar strings used in sections, typically used
  to check for emptiness.
  - Now validates the callback to determine if it is valid; if not,
    processes it as a boolean check
added empty sound.coffee for sound functions
got flips,plaus and takes working. Only a bit more to go
Use statusChange event instead of loginStatus
add config for mordecai
Initial Dynamic Web Project Commit
Aritmetica Express + Rabbitmq - Can't set headers
Aritmetica Express + Rabbitmq - Can't set headers
update my .vimrc
update my .vimrc for plugin BufExplorer
temp
Basic tutorial added
fix parse_list
Problem 6 finished
Updated README
Clique interaction done.
Merge branch 'master' of github.com:yiliangzhou/movie_recommend
Update README.md to include usage.
Did some setup for the song position slider
Extending
			youtube.video.php
Fixed
			TED
			appledaily
			hardsextube
			keezmovies
			pornhub
			pronomovies
			pornrabbit
			sexbot
			tjoob
			tube8
			xvideos
			xxxstash
Removed
			myjizztube (hopefully temporarily)
			snizzshare (not exist any more)
			tnaflix    (video format issue, probably no solution)
			50 Grillz
			Behind Kink
Se agrego la logica del breadcrumb.
fixing the name of the make_platform_dir task.
Added base path for referencing included files.
Moved phpDocumentor tags to top of file.
Added factory class for creating readers.
ignore html files in the html directory
build HTML files
new chapter on prop_er as suggested by Kenji Rikitake @kenji_rikitake
a docbook script that we don't need
starting to add content
ignore emacs save file *~
renamed files .txt -> doc
renamed filed .txt -> doc
changed from .txt to .doc extentions
square module
changed atom to variable
some basic tests
starting an example
CMFPlone package must be loaded first in order to ensure that permissions are defined properly
forgot the json extension again
Add kernel building
don't count whitespace as significant when calculating the hash for a migration
found an unsaved buffer
don't ignore `*connection-settings*` in `db-select`
don't ignore *connection-settings* in a few more places
ensure command parameters are a list
use  by default in db-exec
bind clsql-helper's connection var when entering a db context
Fixes some bugs in date iteration and also made negative iteration
work (by passing negative durations and an end-date < start-date)

also updated to work with new lisp-unit

re ADWolf:#1053 (1.5)
Merge branch 'master' of git:/var/git/clsql-helper
Adding pet-clinic demo.
dodanie arkusza ods z test casami
Changes the background to stressed_linen, holy shit I need to refactor this mess
Fkn Windows screwed up again
Update Articles/Antenna.html_export.html
Prevent event handler tests from hijacking mouse input.
Replace ThirdParty/Queue with an implementation in Core with more features.  Use Queues in CentralBody instead of arrays.
fix warnings. some tweaks based on code review. fix some issues exposed by example czml file. Tests to come.
Heroku: You are trying to install in deployment mode after changing your Gemfile.
fixed formatting in html and added html5 support
Oops, corrected spelling of Kieran's surname - sorry Kieran
Status tabel toegevoegd + aangeven wat zeker ingevuld moet worden
Add composer.json
Merge pull request #5 from aderuwe/composer.json

Add composer.json
let's try this out!
Added grade type to main grade form
Edited the copy
Upgraded Atmosphere jquery plugin.
Now any url is possible (like 127.0.0.1:8080 or localhost:8080)
non important stuff changed
polishing the buddy item
last chat date, forgot to insert into the database
last chat date, forgot to insert into the database
the problem of adding binary commits... compulsory adds
new binary
Merge branch 'master' of /home/jasm/git-clone-to-export/../workspace-android
Add setting alarm on AddTaskActivity completion

* Also added sound, light, and vibrate to notifications
kkkkkk
Daniel UI Change and master Merge
possible fix for OpenLayers CORS access
added legacy toner layers and flavors
version bumber
version bump v1.1.1
whoops, that's why Google Analytics wasn't working...
whoops
don't automatically do it to all the HTML files
Routes, Events
Site updated at 2012-11-04 10:18:20 UTC
Commit 19

Démarage du système d'IA.
Removed validation for password
getObject: more than one identifier can be specified


git-svn-id: svn://oss.dbc.dk/sync_php/php/OpenLibrary/OpenSearch/trunk@48697 30e9dc4a-7611-4fbc-83ba-eecf79b76bd0
getObject: more than one identifier can be specified


git-svn-id: svn://oss.dbc.dk/sync_php/php/OpenLibrary/OpenSearch/trunk@48708 30e9dc4a-7611-4fbc-83ba-eecf79b76bd0


git-svn-id: svn://oss.dbc.dk/sync_php/php/OpenLibrary/OpenSearch/trunk@48709 30e9dc4a-7611-4fbc-83ba-eecf79b76bd0
Purge and write cleansed files - keeping an original folder outside the repository for new / restored functions
replaced index.htm by index.html
New ScanGenericAdjustment() which will look for sampled spectra.
Made play.rb work again.  Added moves.rb.
Profiles in place.
Directory loading
IS 1844 - Shipping Method
Site updated at 2012-04-17 09:54:31 UTC
MSVC Analyze fix: Ensure correct signedness in comparison.
Added a new line

Signed-off-by: Edwin Luijten <edwin.luijten@live.nl>
Fixed DarkRP issue #128
Versehentlich hochgeladene Dateien entfernt
Removed some configuration for 644p.
Updated hardware mapping: swapped the slope output and modulation input, added other PWM 8bit channel to emulate a 16 bit PWM.
Removed unnecessary target checks.
Updated slope algo.
Правки по стилю отображения
Site updated at 2012-04-18 11:04:26 UTC
initial
f*ing encoding
commit test
test
fix raskusatsu.rb
test commit
WIP fix rakusatsu.rb
added new routes and views
Merge remote-tracking branch 'maboroshi/nakaya'

Conflicts:
	app/views/spree/admin/shared/_yahoo_auction_sub_menu.html.erb
mini fix
Merge branch 'master', remote-tracking branch 'origin' into nakaya
WIP fix rakusatsu.rb
mini fix
WIP fix rakusatsu.rb
データ保存(仮)
small fix for snowsunny
commit for merge
fix completed auction
fix locales/ja.yml
Merge remote-tracking branch 'origin/nakaya'

Conflicts:
	app/views/spree/admin/yahoo_auction/importer/import_winnings_list.html.erb
	lib/spree_yahoo_auction/rakusatsu.rb
Toteuta simppeli ryhmänhakupaneeli
Merge branch 'master' of https://github.com/Germaanisoturi/Majavalukkari
Using CacheDBThrottle as throttle for the API in order to get stats
use restapi release in fabfile
Merge pull request #80 from cglapa/release/restapi

API stats
Merge branch 'release/restapi' of github.com:ImaginationForPeople/imaginationforpeople into release/restapi
Checking if language_code is specified
Merge branch 'hotfix/css_fixes'
Merge remote-tracking branch 'upstream/master' into hotfix/fix-askbot-latency
Askbot fix upgrade
project_sheet: Fixed website view.
project_sheet: beautify incomplete edit for reference.
Merge remote-tracking branch 'gnuside/feature/task-1141-projectsheet' into develop
fix website editing
better doc
Merge remote-tracking branch 'cyril/release/restapi' into release/restapi
add a warm message when editing a new project sheet
Merge branch 'develop' into release/restapi
Merge branch 'hotfix/fix-askbot-latency'
Merge branch 'hotfix/fix-askbot-latency' into develop

Conflicts:
	requirements.txt
Merge branch 'develop' into release/restapi
update translations
Site updated at 2012-06-07 12:27:03 UTC
bots can now interact with the environment
webrat changes
no changes
Merge branch 'master' of github.com:GrinnellLocalFood/localfoods
Pulled changes
adding social elements
Add facebook logo
Fixed Mac/Linux support
zmiana 5
Merge remote-tracking branch 'upstream/master'
Added FinancesView
added javascript to hover on menu
set caller & arguments to null in exitFrame (delete doesn't make the
expected effect)
python:学习练习脚本
Merge branch 'master' of https://github.com/IceflowGit/python_script_lgj
Initial commit of our Puppet Module Library
adding note to handle rollover of millis().
Using toolbar decorator as regular toolbar
IDEA-83795 File types panel: inconsistent UI
IDEA-83957 No scrollbars in Settings->Version Control
Merge remote branch 'origin/master'
revert
show $val synthetic fields as local variables optionally
don't show "Perpetual license" in license entry dialog, show validity version instead
hide floating nav bar on dialog show
lambda: return type void-compatibility checks extracted
lambda: accept Object when return type is void
lambda: correct error reporting according to b.50
remove dependency java-psi-api from projectModel-api
exclude test source roots from production classpaths
move Darcula to colorSchemes module
EA-36125 - IOE: PsiJavaParserFacadeImpl.createTypeElementFromText
replace method reference with lambda: default constructor processing (IDEA-93025)
IDEA-82372 Select Font dialog can't render some OTF fonts
Merge remote-tracking branch 'origin/master'
Deleted tmp

Please enter the commit message for your changes. Lines starting
eliminado .sublime-workspace
Merge branch 'develop' of github.com:JugadorNumero12/JugadorNum12 into develop
Primer esqueleto para los partidos (script de turnos, clase Partido y clase Formula)
Esqueleto de las acciones (Singleton comun para las acciones, Helper con funciones auxiliares para modificar las tablas y una accion de ejemplo con estructura basica)
Merge branch 'develop' of github.com:JugadorNumero12/JugadorNum12 into develop
Update styles/stylesheet.css

We're gonna try this...
add bank account link
Merge fork and update upstream
COMMENTAIRE + DEBUG + JAVADOC

Mise au propre code
Verif
JAVADOC
TESTS
added QThread

The gui now palms off the processing section to a ProcessWorker QThread
so that the processing is performed on a separate thread so the GUI
doesnt lock up, now all I have to do is implement a proper stop
function so we can have a cancel button so the user can cancel the
directory listing if they want to and add in a pretty progress bar so
the user can see what its doing...
Site updated at 2012-11-28 13:14:46 UTC
added alot to homography still needs compiling has nobuild right now
after merge with jasons and andrews code
saving color configurations added
homography compiles
homography setup but the raytracing has a floting point exception
homography is mostly working windowing gives a high threshold
homography mostly works switching  back to pot nav for comp though
updated position with reverse needs testing end of sat
gps is in before qualify dead cells in battery
Added ColorStat saving and loading. Added intial JAUS code in MST_Control.
before robot merge
after merge
Removed unused variables from MST_ColorStat/src/stat.h.
Added more to JAUS in MST_Control, still doesn't actually do anything.
JAUS will now get GPS data from midg.
Added waypoints with JAUS.
MST_Control now passes waypoint list and active waypoint back to JAUS.
Fixed bug and added setting speed to executing JAUS waypoint list.
Merge branch 'master' of ssh://10.42.43.75/~/Code/igvc_2012_repo
after 36 volt fix moves to waypoints needs fix on contiuing when done in control
Removing closing ?> at end of files
Minor code styling
changing gem versions to please heroku
updating gems to fix jquery-rails bug
adding player resource and configuring spork and guard
adding basic player functionality
Bumped version, modified and added functionality

Bumped version
Simplified the pretty_data_tree function
Added description and documentation url functionality to pretty tree
changed thresholds to smaller numbers
Added ModelImporter to core: Incomplete
adjusted for arrays
Merge branch 'master' of github.com:N0s3n/applied-bioinformatics
Fix broken query in Mongoid 3.
Fix has_role? when no roles exist.
Site updated at 2012-08-07 14:19:43 UTC
Added a new manual camera to the editor
Added map serialization
Merge Conflits
Add deleteAllForTopic because removing topic does not remove subscriptions...
basic fileshare service testing
ASP.Net update
Fixed a bug in the chart table
Fixed the cluster loop
Added readWrite.js
enabled all tests again, tryinig to avoid jenkins problems with temp dirs
add .egg-info to gitignore
setting to customize thd container name per request, fixes #5
In the EventManager class: Added a function to remove a process, remove a process from a specific state, and change a process's state
Whoops. Changed the finish condition to use the STATIC variable, not a hardcoded int.
Implemented the comparable interface in the Process class
Made the getMemoryAvailable function more visible in the MemoryManager class
Also created a function to return the largest process
Made the process count reset
- Added speech directions + GUI
- Added a check to see if the edge of the marker is at the edge of the screen, in which case the size of the marker is unreliable
Including resource files
Do some default encoding on start. fix #520
listen search
Update _posts/2012-10-12-nexus-lian-jie-linux.markdown
Removed moving average calculation
removed common module
Added a bit of information to the readme.
session control - no more than two shouts at a time
Align lists with code
Move Arch image to repo
Fix quote
Continue adding to NoteBag.py, and add config file
Make note name entry grab focus when the program starts
adding PIDSteeringWheelAngleRegulator.cs (using common PIDRegulator class)
fixes in other regulators
fix in ReScaller.cs (how could i be so stupid?)
turning on all real regulators (and its not crashing w/o external devices)
removing not needed file
Reverting changes to project files. Don't commit these.
Reverted changes to /cage. What was broken here?
Converted gadmin messages to adminAction.
TFM_Util.implodeStringList is deprecated.
I think that having this broadcast may lead to spam.
Changes to /rd and /ro.
Eliminated use of WorldEdit and op, deop kludge :P
add kitchenconfigure/enable buildotherrepo in menu
Further typo fix from test code
40mm Casings, currently unused
susie|prakash|tech task added log4j configuration for logging
kernel version 3.3.2
changes project dependencies
Fixing specs.
Adding music.ogg format.
Adding audio resource. Ogg files.
Adding sprite class.
Adding animation class.
Public Section Formating Updates
Refactor the benchmarker

Allow specifying baseurl (and map key) on commandline,
shows unsuccessful results error messages
Forgot to pad the About link.
Fix missing Websites project scaffolding files.
Merge pull request #748 from ogail/build

Fix missing Websites project scaffolding files.
linting

PEP8 standards, without line length
Improved InputField Keyboard Listener A LOT
minor fix categories
testando conflito
Merge branch 'iss53'

Conflicts:
	moving/teste_mv
Testando --merged param do git branch
Merge branch 'testing'
Merge branch 'master' of github.com:abevieiramota/git_aprendendo
Successfully integrated the blog archieve section with current functionality. Removed the previous rendering mechanism
initial commit
little cleanup from the migration to github
creating release 1.0
Optimized images
Text and glory added to projects
cv.md added to repo
Adding rspec configuration to default colors and documentation format.
Removing convinience development dependencies, tweaking gem info.
Version bump to reflect pruned dependencies.

Version 1.0.1 was deployed, but not commited to version control.
Woops.
Added crude drop event
Merge branch 'master' of github.com:adamkiss/InputfieldAceEditor

Merged $this->_() fix
Updated the link color and style
Enemy shot. Bounding box
Fix building with gcc 4.6
Fix netfilter headers_install
Final fixes for gcc 4.6
Revert "Fix netfilter headers_install"

This reverts commit 97db302f0eeb4ea488f07d92459c500fd36b0684.
Better fix for netfilter headers
Fix arm-eabi- compatibility
Merge pull request #2 from mblaster/jellybean

Jellybean
bugfix: the Content-Length response header for HEAD requests should leave intact when cache hits happen.
adding default ignore list
Change the layout of the index page.

Add border style by using embeded css.
added .gitignore, fixed selected bug
removal of some legacy comments

they aren't really useful now
added collapse on Compositions
adding execution steps
Creación de material para Enli 2012

Agrego material completo para Enli2012 del taller de Joomla! 3
removed 2 more spec files
add the ability to fill the response by hand
Merge pull request #1 from simock85/master

add the ability to fill the response by hand
31.05.12
Enable again capability to install to SD card
Removed back button from ShowPassActivity and added to the
menu/actionbar
Change resource name
Added portuguese, catalonian and french translations
Little cluelessness
Create/modify some layouts, added more translations (ca, fr, pt)
Added NOTICE in the about dialog
Show a toast with a little disclaimer on init
Moved manual updater from menu to preferences
Prevent auto updater and init toast to show multiple times
Update english and spanish changelogs
New line in NOTICE
Updated AdMob library to v6.0.0
Modify text in about dialog, now scrolls smoothly and don't get darker
when pressed
Use new ad size : SMART_BANNER
Little changes on layouts
Just apply source->format in eclipse to all XML files.
I think Dlink, Andared and Discuss algorithms are done.
Use Transformer API for XML serialization.
Merge pull request #2243 from joshthecoder/timob-8953-2_0_X

[TIMOB-8953] Android: XML: Erratic Namespace Definition and Redefinition (backport)
Merge pull request #1739 from hal-gh/TIDOC-421

TIDOC-421 APIDoc UI.Label - add advice about how to force a line break
delete github pages
Site updated at 2012-03-19 04:54:53 UTC
add filter content helper
masters entry should be with slave zone type
Merge pull request #1 from chrisferry/master

Configuration error with location of masters entry
Predator minimax toegevoegd, zitten nog bugs in
nog wat commentaar toegevoegd
change readme and more
Rename local variable.
Start implementing m-mode effective source for Kerr equatorial orbits.
Use consistent capitalization of PhiS throughout.
Fix circular orbits code after api changes.
Move variable declarations to beside their definitions.

It's easier to keep track of things this way.
coffee lint
naming refactoring and a performance tweek on the @noopUpdate [now removed]
Fixes #9
Merge remote-tracking branches 'origin' and 'origin/v0.9.x'
Release 1.7.6 with some bug fixes for mobile's new paths
Update vendor/frameworks/twitter/bootstrap/sprites.less

replaced sprites with font-awesome
Call this 0.1.0-rc2.
Removing unncessary import.
New format_table option: key_order

This solves the inconsistent-output-order issue by defaulting to a
sorted-keys order (ASCIIbetical on my system --with-liblua=included) and
provides a mechanism for hiding output: if keys are not in key_order,
they will not be output.
New format_table option: maxn

maxn provides another mechanism for hiding output, limiting ipairs
output to indices <= maxn. See new test.nse script for example usage.
Playing with new theme styling.
Continuing to tweak theme
Fixed tags - they need to be comma-delimited
Integrated modernizr
Regenerated after fixing tags
Continuing to iterate on new design
Tweaking styles to try to get to better blog design.
Alternate navigation treatment.
Cleaning up CSS, better layout of lines on baseline grid.
Cleaning up and organizing CSS
Cleaning up CSS and markup.
Use different markdown parser to support inline classes and IDs
Updated headline styling to move them into behavior.
Cleaning up CSS
Updated posts to use proper classes for styling.
Updated template and markdown pages to use proper classes for formatting.
Support for excerpts on posts and some basic styling on index post list.
Cleaning up CSS.
Better positioning of post date.
Fix alignment with baseline grid
Removing extraneous markup to simplify page structure.
Removing unneeded theme elements to simplify directory structure.
Make about area align to baseline.
Added space to prevent Maruku from minimizing empty HTML tags.
Ref: http://kjetilvalle.com/posts/gists-with-jekyll.html
Remove version 0.4.x.
Merge pull request #4 from bradgignac/add-additional-engines

Remove version 0.4.x.
wrapping up R section
undo patch
downgrading ckeditor
Tidied some of the checkout steps code. Introduced membership as default first step.
Entity physics update
charset forced to utf-8 in css
Methods should include the actual request.
Make sure that the request method is an 'action'
allowing to upload empty keys
got disconnect working
mvbt
reindexed tests in 079-unused-directives.t
update change in the discount rate
log
Introduction changes - couldn't compile
fixed some bugs in the request/response process
Changed sub menu background
Added mocha.
Watcher progress.
Created Satis file
Updated satis.json
passe ou casse
Set TCP_NODELAY option on the TCPSocket

* Fixes slowness issues on Linux
Fix tests and remove 'kind_of?'
#362: Include QTimer library has been updated.
Merge remote-tracking branch 'remotes/thoughtbot/master'
pizza gifs
Cut lookup tower screenshot.
Minor code indentation.
Add `use Orchestra\Extension\Pane`
fixed url
add dist stuff
Merge branch 'master' into gh-pages
Update idle animation to 12 fps
Split game json into separate docs in couchdb

Update game loading to account for the split changes
6991c33393c6a5ed302674b21edf5dd81c082978
Site updated at 2012-03-16 07:49:08 UTC
Added compiled html for github pages
Merge branch 'release/v0.1.0' into develop
WIP: Added some styling to Ruby styleguide
WIP: Modified base styles

 - Added dynamic menu
Added table of contents functionality + styles
WIP: Added preliminary styles for snippet plugin
Added styles for snippet and fixed table of content styles
Added compiled html for github pages
creates first version
Changed image and js paths to absolute paths
Merge branch 'develop' into gh-pages

Conflicts:
	_layouts/default.haml
	_layouts/default.html
Changed wrong css reference to snippets
WIP: assets and links handling for both prod and dev envs
Chaged asset path for ie styles
Adds image_link tag for images
Merge branch 'feature/liquid_asset_handling' into develop
Fixes environment variable defaults for Jekyll
Added initial content from github styleguide
Added overview content
Add style for inline <code> tag
make portlet automatically assignable
The CNAME.
Correct a crashing but with pushdown stacks
Add items to portfolio and update copyright date
TwitterOAuth認証のコードを書き始めた
Unit tracker now working
tweaks and fixes
Presentation is good to go, but could use some sprucing if time allows it
Damn awesome
/ ‘Chat/chat.js’
Cleaned up syntax and some comments, added data sanitation per WordPress/WordPress@e588812a49
Removed some of the docs to make it more condense/readble
junk file updated
Add a test case for #53 #54.
Fix up #53, #54
Implement the AppCache for Beginners tutorial.
Merge pull request #34 from dart-lang/jason9t-appcache

Implement the AppCache for Beginners tutorial.
Bug #60027. UI FIxes - Backlog Planning
updated to sqlite v3.7.13
version bump, added contributor, mention #85 #86
added test to create fts contentless table
Merge pull request #87 from coolaj86/with-sqlite-3.7.13

Updated to sqlite 3.7.13
adds gemspec
Merge branch 'patch-1' of github.com:diegoy/Mechanize-ProgressBar into patch-1

Conflicts:
	mechanize-progressbar.gemspec
Change hour 24 things to hour 23
thedroid location
Make sure `unittest.expectedFailure` is imported correctly on python 2.6
Add _tags with extra rules on the end for camlp4
The Unix domain socket connect code should live in the client repo
Added how does it work.
Octopress init
Site updated at 2012-03-29 05:22:53 UTC
Robustness: If some logging macros are already defined, undef them to avoid preprocessor errors
[snull]: Fix compiling errors

below commits in kernel make snull fail to compile:
3b04ddde02cf1b6f14f2697da5c20eca5715017f
d314774cf2cd5dfeb39a00d37deee65d4c627927
288379f050284087578b77e04f040b57db3db3f8
bea3348eef27e6044b6161fd04c3152215f96411
added frequency distribution charts with drilldown
404 page without Jekyll (GitHub pages 404 doesn't support them) and with improved Javascript.
working on quadrants
Merge branch 'project3' of https://github.com/eastsideski/OS-Working-Files into project3
Site updated at 2012-04-07 21:48:51 UTC
Added 'Uploaded by' field for bfiles

git-svn-id: https://svn.eionet.europa.eu/repositories/Naaya/trunk/eggs/naaya.content.bfile@19232 a0171fae-0946-0410-966d-b1775066cd26
labs 08-11
Fixed a bad reference to the JS file.
Added method to get all outgoing relationships.
css-edit
unused imports / whitespace
POST/PUT response should always match GET (including datetime precision)
Create about dialog and delete old source
Bump resque dependency from <1.20 to <=1.22.'
Animated DOM-element
Add Error Formatting for Sign-Up
bakım
Implements Alter colors
Implements Alter colorsg
Sistema somente falta notificacões - SMS - Email
Sistema somente falta notificacões
 - Email
Sistema somente falta notificacões - Email
Merge branch 'master' of https://github.com/equipeweb-grupoperaltas/SIGP.git
Eliminando llamado redundante
Ordenando el código
Corrigiendo el funcionamiento del mensaje de salida
Eliminando archivo inutilizado
Agregando particiones nuevas a la lista
updating rehersal dinner info.
Save currently-active view
Site updated at 2012-09-27 03:10:06 UTC
Got rid of use of symbol DEFAULT-ROLE.
Merge branch 'master' of https://github.com/moesenle/cram_highlevel
Fixed MATCHING-PROCESS-MODULE predicate in perception process module.

We need to check if the designator given with the (obj ?obj) property is
an object designator.
Added designator property assertion (TO PERCEIVE).
Merge branch 'master' of https://github.com/moesenle/cram_highlevel
Added current position to CV.
removed search form in search tools, moved date filter up top
[~TASK] Fixed duplicate output of price info with tier prices (fixes #18)
[~TASK] Checked extension against Magento 2 coding standard and solved violations
[~TASK] Added function comment to constructor
[~TASK] Basic implementation for issue #13 - needs more testing
[~TASK] Refactored tax rate calculation for shipping tax class
[~TASK] Changed function comment
[~TASK] Increased module version number
[~TASK] Added translation for the system configuration options
[+TASK] Added type hints
[~TASK] Removed log messages
[+TASK] Mark product indices as outdated after tax classes have been assigned.
[+TASK] Added customer tax class "companies"
[~TASK] Added NoState to list of recommended extension
[~TASK] Changed code style
[+TASK] Imporved tax rate naming, added seperate label
[+TASK] Now truncating "tax rate title" database table on tax setup
[~TASK] Changed form layout for multiple countries
[+TASK] Added separate configuration for Austria, changed directory structure for xml files
[~BUGFIX] Notification does not hide after setup with activated cache (fixes #8)
[+TASK] Added separate configuration for Switzerland
add file

test add file
Add link to LeaveFlexWiki project
new directory structure
added option to specify tmp directory for h5 loading
cleanup files from directory change
Added fRequest::isHead() and fixed fRequest::set() to work with `HEAD` requests - fixes #128
wrote bulk of I2C code, added MCP23018 datasheet
Fine-tuned features.
Adding freeplane files and image material.
Site updated at 2012-05-11 21:42:48 UTC
なんだかんだでくずれていたので修正
fix: File::Path::mkpath error handling

RHEL5's File::Path::mkpath() doesn't support the error parameter.
According to the documentation, if we don't pass this parameter,
File::Path::mkpath() will die() in case of error. This is by
the way what we want/do.

So, I drop this {error => \my $err}, this will avoid a error message
on RHEL5 and will simplify the current code (error → die).

closes: #1817

Reported-by: Jason Smith <smithj4@bnl.gov>
Added ability to override the default category handling on the icon
menu. Categories are loaded from SABnzbd.
Merge pull request #13 from mattb3/master

Added ability to override categories from popup menu
add new service.
Merge remote-tracking branch 'origin/master'
Meetups on wednesday now.
fix bug in evaluation module
Addded (not yet working) moxy-oxm-mapping sample.
Fixing links

Linking Prism correctly
Adding link to Jekyll.
Added ApartmentGuide.com
add travis CI build status image
updated package.json
adding license (MIT).
Exclude rvm config from git
Add spinach and set capybara driver to poltergeist
Exclude pow config from git
Add facebook login
Kindle test
synatx fix and rm unused
pdf link fixed
renamed from flaskext.gitrpc -> flask_gitrpc
Web server code is working
Cleaning up
modification des structures tableau et liste, avec choix d'utiliser la structure souhaité :
	-commenter ou décommenter le contenu de la variable FLAG dans le makefile
HtmlSuiteLauncherをHTMLLauncherのサブクラスに変更
update with boost strong components