labofsahil/github-event-dataset-2012 huggingface dataset:
Revert "Littered the codebase with more ugly query_measure measurement lines."

This reverts commit 305281a83ee9f1431a8915799bae5fcd0163892c.

Conflicts:

	src/rdb_protocol/query_language.cc
Revert "Added query_measure.hpp and added some query measuring printf code (which is completely inactive normally)."

This reverts commit 33e8fb7bb5aa2ee4745d2975709fb9eac397406c.

Conflicts:

	src/query_measure.hpp
	src/rdb_protocol/query_language.cc
Removed some silly uses of goto.
Made us check for EINTR when doing open(2) syscall.
Deduplicated /proc/-reading code in proc_stats.cc, made it not have a buffer overflow.
Made blocking_read_file_stream_t use open-style reading, not fopen-style reading, made it loop on EINTR.
Made blocking_read_file_stream_t have an init method that outputs an errno.
Not sure why this wasn't already committed.
Fixed erronious comparison in BETWEEN.
Added test for cJSON_cmp fix.
Merge branch 'rethinkdb-next' of github.com:/rethinkdb/rethinkdb-internal into rethinkdb-next
New release note
Adding libv8 to external with a static build
Removing v8 dir
Now checking in libv8 static for real
I attempt to provide more static functionality.
More work.
Adds upsert to python client.

Addresses #34. (In public rethinkdb).
Merge branch 'rethinkdb-next' of https://github.com/rethinkdb/rethinkdb-internal into rethinkdb-next
Merge branch 'rethinkdb-next' into sam_nogoto

Conflicts:
	src/arch/io/disk.cc
4store now launched by webbox
Fix bug when Login-box is displayed for authenticated users
shit, we can't do it that way -- d-i/installer comes in the checkout
Split up functions for high/low current galv
DevHelper 20120411 -- minor improvements
Some changes
Merge branch 'master' of github.com:daoleen/bonanzapeople
adding resque for production
remove table's table-layout:fixed;
adjust position of right canvas-guide
fix indentation
check if w3c box model, only once
Merge remote branch 'origin/development' into development
Merge branch 'development'
- fixed : style
fixed some styling
- added : default form values jquery plugin
Added gitignore and public folder
moves start and stop login onto controllers
changed request headers per @dhh
changed request headers per @dhh
fixed merge
cache-bust the markdown example images, remove the notification that they are placeholders
updated space references to monthly
test 1
blog entry 1 edit 1
CraftBukkit change
Dev 1.4.6-R0.2
DE794: Make sure default group names are valid
Merge remote-tracking branch 'origin/master'
Merge pull request #694 from galthaus/pull-req-master-fd64b89ad3

Make the group name defaults valid under the new validation scheme. [2/5]
Revert "Revert "Add a front-end to chef-server to load-balance""

This reverts commit f7044735c8932c87f3c010bdbe16294404127415.
Add missing header info for chef
Add allow for big files to be uploaded.
Merge pull request #503 from galthaus/pull-req-master-1c6efe8d7f

Reenable the load balancer for chef-server [1/4]
Added StaticPageController
Improved static page controller
solved ticket https://issues.jboss.org/browse/RAILO-1988
solved ticket https://issues.jboss.org/browse/RAILO-1981
test
test
test
test
test
changed classpaths and removed .classpath from git tracking
Merge branch '4.0' of github.com:dev-21solutions/railo into 4.0
add pagination for done page - fixes S2372
don't save item if its title is the same as the last one in the db: fixes S4016
Dividing service for managing user access to processes and service for
starting new processes
Singlaing process event moved
managing processes changed
forgot a deref
added more open source projects
linked open source projects to their github pages
Fixing syntax error in Readme

[ci skip]
add android startup servicemanager
Issue #155 fix segfault on LootDef operator=
Issue #155 fix disappearing tooltips when loot added
Fix equipment slots being highlighted after dropping an item
Updated setup.py metadata
added photowallet to buildbot.yaml
Merge branch 'master' of github.com:drewcrawford/buildbot
Merge branch 'master' into work-4885
пофиксил баг с return outsite the function
Quick style fix for share container + tags.
Porting the Vector.reverse() method fix from CSV plugin into main + smoothing less
SVG Export: Adding doctype tag to SVG
Core: Added trigger for 'change' event when a stroke is done being added to data store.
Core: code that autodetects data format on import now expects more explicit sign of use of data-url format.
SVG Export: var out of scope bug resulting in NaN on lines - fixed
Adding example of base64-compressed SVG export
Adding new SVG export format and "change" event to README
Merging bug-fixes for SVG plugin, new 'change' event emitter and updates to documentation
latest build
Relax some regexes and clean up some code
Add support for <= filters in Mapnik
Better error message when a mapnik version is deemed unsupported
Added light snow
Added tmux-mem-cpu-load segment.
Customisations.
Disable useless segments.
Disable `battery' segment.
Merge remote-tracking branch 'origin/personal' into personal
Merge pull request #28 from ebbinger413/staging

Links were tested in staging and worked without issues. The config file in master will be updated after this pull request. Approved.
CHANGED - Sites URL In Config

Updated the sites URL in the config file after the merge from staging.
NEW - Added Web Config

Create a web.config for windows servers. This fixes the URL rewrite
issues with Windows Azure or any IIS hosting.
Merge branch 'master' into staging

Conflicts:
	web.config
MULTIPLE - Updated the Recipe Create Form

MERGED - Merged with master branch to pull in all the changes
FIXED - Recipe Create Form, added in a check to bypass the upload and
resize functions if an image wasn't submitted through the form.
Merge branch 'staging' into recipe-create-form
Featured Collection improvement, bug fixes, etc

fixes unparsed PHP error on items/show, CSS and labeling tweaks
regist biological entities using RuleEntityConverter, and stop using parser in RuleFactory
Fixing compile issue
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
removing tests that in hindsight ought to be connection level and not parser/generator level
Moved the jQuery example to a new page and update the styles
Validating Edit Event Form, starting to work on event states
Updating simple-form, grid and form layouts.
removing ivy
show movement point
Reverted head
Merge remote-tracking branch 'origin/master'
Adding author bio stuff!
undo-tree.el: Update package to version 0.3.4

* undo-tree.el (undo-list-pop-changeset): fix pernicious bug causing undo
history to be lost.
(buffer-undo-tree): set permanent-local property.
(undo-tree-enable-undo-in-region): add new customization option allowing
undo-in-region to be disabled.
undo-tree.el: Update package to version 0.4
updated undo-tree package to version 0.5.2

* undo-tree.el: add diff view feature in undo-tree visualizer.
Implemented persistent storage of undo history.
Create proper registerv structure when storing undo state in register.

Avoid polluting name-space by renaming make-undo-tree-<struct> functions to
undo-tree-make-<struct>.
Adding Atlas logo
Rearranging client and server module sources and pom.xml files.
Moving test classes to more appropriate client module.
Moving mainapp module into root of project.
Removing unneeded idea project files.
Minor tweaks to idea and pom.xml files.
Fix for CJLO-10 "[MYBUGDET] Crash on iOS".
Fix for CJLO-16 "Layout fix for settings screen.".
AlphabeticalListTest: small update to the settings screen
Added the 'SegmentedListTest' program
MOSYNC-2324: added setters for the header/footer font size, font color and background color
MOSYNC-2307: changed the structure of the list view/section/item - part of performance improvement
Jira task CJLO-42 "Add toggle button on iOS."
Fix for CJLO-43 "Label bug".
Jira task CJLO-42 "Add toggle button on iOS."
Added the ToggleButtonWidget files.
Fix for "OptionsBox wchar16 bug on iOS".
Fixed an alphabetical/segmented list related bug on iOS.
MOSYNC_2307: added more properties for the list item + changes in the way the UI is updated when a section/item changes
"Fix the ListViewItem click display(should display type + amount + details)" on iOS runtime.
"Remove static path files from iOS project".
Merge remote-tracking branch 'bogdan/listView' into listView
Merge remote-tracking branch 'spiri/listView' into listView
ListView - fix segmented bug
Removendo PUT e DEL dos testes
[AS7-947] prepare for :reload
move lifecycle ops to the running server resource
allow operation handlers overrides for proxies
expose lifyecycle ops for running servers
introduce a relaoding state
Small fix to download indicator, must port to C#
Merge branch 'master' of git@github.com:encog/encog-java-core.git
Optimize DeriveMinimum
Optimize EngineArray
Optimize FlatNetwork
Optimize FlatNetwork a bit more
Optimize FlatNetworkRBF
Merge pull request #109 from leanto/fix-issue-105

Fix issue 105 (partial)
Make PrgPopulation use BasicPopulation
Fixed test. ENCUESTAME-440
Finished registry_* functions
Created EFProductRepository

Created Repository
Created IQueryable of Product
finally got around to documenting the Node, Group, Stage, Shape, Layer, and Container constructors
added dist files to ignore file and updated Thorfile.  Dist files should no longer be checked into the repo
namespace tests to avoid fixture conflict
Merge pull request #17 from errm/master

Fixes #16 - Output should parse correctly 
Handle outputting years and months better

fixes the bug raised by @flynfish on my fix for #16
unneeded condition is removed
Disable soft deterrents for now (reverse-merged from commit ec5de332743e70b77524b558ba77ceceea8b6481)
Everyone in #essentials can burn andrewkm
Improve the newlines in the yml files. (All ymls kits, etc need testing)
round 2 of import fixing
Add toggle-full-screen function for Windows OS
better statup and shutdown for websockets; add an idle timeout for web clients
better statup and shutdown for websockets; add an idle timeout for web clients
testing framework for websockets
symlink to use websocket test
revert port
Removed /msg from .gitignore by Eric's advice
Added sounds for Thinkbox
Merge branch 'master' of github.com:cwru-robotics/cwru-ros-pkg
Fixed a syntax error in Abby's sonar.launch
Added support for swapping left and right drive.

Added a parameter to base.yaml "rl_swap" that will
swap the left and right sides when set true (similar to how
push casters swaps front and back). Only affects the directionality
of velocity commands sent to cRIO, not TF coordinate system.

Untested!
Fixes a trivial error in start_base.

frame_id should begin with a slash or you get warnings.
Adds initial pose to 2nd floor launch file.

Pose was created by Li Lu in EECS 376 Spring 2012. Robot is in the
2nd floor hallway, near the elevator, facing the door to 210.
lower memory consumption.

Changed sSkeleton class and added Skeleton::Instance to lower memory consumption. Now Skeleton holds only bone hierarchy, and Instance holds actual per-actor bone transforms.
moved lucene instructions into template
Fallback to the default string (similar to the HTML)
Merge pull request #5 from yurydelendik/patch-2

Fallback to the default string (similar to the HTML)
Fixed everything
Added validations for creating new clientes
Driver keeps track of specialization requests.
cleanup preset loop

This is a fairly ugly patch, but doesn't do a whole lot except remove a
level of indentation.

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
resolve module directory for kernel sooner

No sense in waiting on this...

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
update comments in config

This really should be moved into a man page.

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Correção no email de compra.
申请翻译 Command line 。
support for 'ignored' urls
data_dir now provided by a function
guizzardi
add secret
fix namespace
implement rough find method
implement load
fix missing import
add data structure for blog, post and comment
add sample data
implement blog list view
implement blog detail view
add todos
Fixed two small spelling mistakes

- Saw these during normal usage today.
  "parens" or "parenthesis" was spelled as "parans".
  Fixed two instances of this to "parenthesis".
improved compatibility testing, fixed a bug with premake, optional clean
Fleshed out work bio, added companies and a proper sitemap.xml
Added responsive Joomla Template using Foundation
test put and dump w/o failure
syntastic vimrc configs
- Update to 0.74

Changes:	http://search.cpan.org/dist/CPAN-Perl-Releases/Changes
Feature safe:	yes


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@305772 aed309b6-a8cd-e111-996c-001c23d10e55
- Update to 1.10
- Convert to new options framework
- Allow for any available version of TCL to be used
- Add LICENSE
- Remove indefinite article from COMMENT, update
- Mark MAKE_JOBS_SAFE
- Trim Makefile header

PR:		ports/172456
Submitted by:	Paul Schmehl <pauls@utdallas.edu> (maintainer)
Approved by:	makc (mentor)
Feature safe:	yes


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@305773 aed309b6-a8cd-e111-996c-001c23d10e55
- Update to 2.19

Changes:	http://search.cpan.org/dist/Term-Menus/ChangeLog
Feature safe:	yes


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@305774 aed309b6-a8cd-e111-996c-001c23d10e55
Release MAINTAINERship.

Feature safe: yes


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@305775 aed309b6-a8cd-e111-996c-001c23d10e55
- Fix plist referencing 2 nonexistent files with NLS [1]
- Trim header

PR:		ports/172597 [1]
Submitted by:	bdrewery
Approved by:	Jason Harris <jharris@widomaker.com> (maintainer) [1]
Approved by:	portmgr (erwin)
Feature safe:	yes


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@305776 aed309b6-a8cd-e111-996c-001c23d10e55
- Add few more knobs (mostly multimedia-related): FRIBIDI, GLX, LIVEMEDIA,
  MATROSKA, TWOLAME
- Augment descriptions of MP3 encoders; spell "Ogg" correctly everywhere


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@304881 aed309b6-a8cd-e111-996c-001c23d10e55
- Update to checkin 98a87680a1

Changes:
  * jail -cu: Support PARALLEL_JOBS/-J for buildworld
  * jail -u: Fix svn method crashing on 'delete-old'
  * jail -cu: Enable ccache support, requires host have devel/ccache
  * jail -u: Fix OSVERSION not being updated/populated in /etc/login.conf

Feature safe:	yes


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@306013 aed309b6-a8cd-e111-996c-001c23d10e55
TAYGA is an out-of-kernel stateless NAT64 implementation for that uses the
TUN driver to exchange IPv4 and IPv6 packets with the kernel. It is intended
to provide production-quality NAT64 service for networks where dedicated
NAT64 hardware would be overkill.

WWW: http://www.litech.org/tayga/

Submitted by:   melifaro
Feature safe:   yes


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@306014 aed309b6-a8cd-e111-996c-001c23d10e55
- Fix build with clang

PR:		ports/172357
Submitted by:	arrowdodger <6yearold at gmail.com>
Obtained from:	upstream (20110409 and 20120608 patch)
- Fix typo in MAN1

PR:		ports/172465
Submitted by:	Oliver Heesakkers <dev2@heesakkers.info>
1) Fixed bug in unit test that was causeing it to fail
Added initial Update code
minor cleanup
Added Update code, sequence operator now exposed in surface syntax
syntactic sugar
Added 'InPort' pseudoport for policy sequencing, useful mod actions. No semantics yet
Added slick verison of Update using policy composition and restriction
Merge branch 'master' of github.com:frenetic-lang/netcore
Adds pageHash to token
Removed 1337 token
FL-43: fork toolchain-funcs.eclass, experimental tree only
Funtoo ARM profile
openrc update with yet another ipv6 fix, masked
Merge branch 'master' of git.funtoo.org:funtoo-overlay
do not force xorg flag
handled saving data to .csv file
models updated (little changes)
retrieve data from csv file
Added 'IconBitmapScalingMode' to MetroWindow.
Reactor ConnectAsync checks TcpClient.Connected
Funcionaldiade - Solicitar Perfil de Empresa
Makes OS_TENANT_ID and OS_TENANT_NAME separate in RC file.

Fixes bug 966038.

Change-Id: Ie57e816ad7edfa0cb636a93413b8b7faf72f0d2d
Replacing the ULs with DLs on the instance detail page.

Fixes Bug #969612

Change-Id: I6d69cb4c939424fc2a002c59c830f848a213510f
Using internalURL for Keystone endpoint.

Change-Id: I50632a7dda2d7fd64f083135b91d821e050fc284
RestServer now is named RestMock, and some refactorings
getting rid of git submodules. using phar archive downloads instead.
Merge branch 'framework' into container
Merge branch 'framework' into exception
Merge branch 'exception' into db
Merge branch 'container' into newid
Merge branch 'db' into newid
fixing the build
wrap the autoload setup in a closure so no variables contaminate the global scope
Merge branch 'framework' into container
Merge branch 'framework' into exception
Merge branch 'exception' into db
Merge branch 'container' into newid
Merge branch 'db' into newid
setting up ci dependency to use codeigniter file path
moving ci_installed assertion into framework
cleaning up autoload
Merge branch 'framework' into exception
Merge branch 'exception' into db
Merge branch 'framework' into container
Merge branch 'db' into newid
DEPRECATED.txt added
Fix a crash due to bold font.
fix bugs of Qiaobian
fix about shuangxiong & duanchang
Fixed markup
Merge pull request #63 from fabpot/patch-7

Fixed markup
checkstyle errors cleaning this will probably be the last as checkstyle errors seem to be a load of shit GF
Added Presentation URL to the presentation
Enumerable#sum can now take a block

The block will act as a filter, the same as running through #select
before using #sum. Also fixed a bug that made #sum fail on enumerable
classes without #flatten methods.
Added Integer#goes_into?
Version 0.4
add graphstats command to count trips in patterns
output cumulative numnber of patterns and trips
fix n trips output
Fix #799 by separating out steps when roundabout status changes.

Conflicts:

	opentripplanner-api-webapp/src/main/java/org/opentripplanner/api/ws/PlanGenerator.java
convert NAVD88 to NAD83 (close enough to WGS84), closes #826
Merge branch 'stable' of github.com:gcamp/OpenTripPlanner into stable
added skip_before_filter and auto-login for convenience
heroku stuff
Offer thesaurus title as link name if available



git-svn-id: https://geonetwork.svn.sourceforge.net/svnroot/geonetwork/branches/2.8.x@9245 ff403467-3f20-0410-99e5-ff581e626a08
fixed creeping harvester ids bug

git-svn-id: https://geonetwork.svn.sourceforge.net/svnroot/geonetwork/branches/2.8.x@9246 ff403467-3f20-0410-99e5-ff581e626a08
move up ajax to make site load faster. also speed up fading to give the appearance of a faster site.
add NOINLINE pragmas to make RULEs more likely to fire
Updated to handle zip files with non-zero length comments.

The "End of central directory record" is only 22 bytes from the end if the comment length is 0.  This change handles situations where that is not the case.
Merge pull request #23 from Renanse/master

Handling non-zero length comments
Diverged21.txt
Merge branch 'master' of https://github.com/gitstudenttn/TestRepo
Sistemazione area caricamento
nicer if
changed to connect to outside aprs server
add isntructions about setup
adding python-setuptools to build-deps
Merge pull request #94 from CoolCold/master

adding missed debian build dependancy
api: return api_level with login
removed the Epanechnikov Kernel. Could be added at a later time again if we decide to give the user an option to specify kernels. However most refs claim kernel not important
ENH: use fieldtrip to do everything
ENH: renamed sleep2ft for reading FASST data only
Moved the access post process dispatch handler around and added a comment to say what its purpose is.
Sod you main class name!
start of payday create cmd.
Changed file names in my gold.
* explicitly make $custom_true = false for each returned post
* ensure only published posts are returned
Added method to create ComboBoxes from cardDeck for keeping track of guesses as well as necessary variables
test and fix for the boxing problem Jeff saw building grails
Merge branch 'master' of https://github.com/groovy/groovy-eclipse
stub out static directories
ignore virtualenv directory
rough draft of one api endpoint
funcionalidade de upload de fotos com php
build adjustments
Merge branch 'master' of https://github.com/guybedford/require-is
raise exception when an unexpected response start
remove uneeded constants and fix typo
response as context manager
Added projects content framework.
Facebook javascript SDK added to index. Must change code when uploading to acutal site.
add FFT!
Bug fix: escape ; and =
utils/get_pattern_offsets.py: fixed some typos
Adds Pidgin named scratch pad
Merge pull request #12 from vidibus/master

Added mime types
Setup initial empty classes
2nd commit for content audit
dropping items now leave them on the floor
Removed Global variables for Quiz & Questions
added a rxlsbfirst() function to correctly read multi-byte registers
Adds a while loop snippet
adds a do loop snippet
Adds a for loop snippet
Update PhoneGap - Test/www/index.html

onTap instead of onClick
Added disk usage and network stats
remove unused match_method_macros
Added support to find port bindings
Add some more fields
Updated to RC0.3
Corrected usage of file separator since Jar resources and Jar entries
always use slash.
Tower auto fires at closest enemy. \n\nAddedFiles : Projectile.as :: projectile class generated by Tower class. \nFile Edits : Tower.as :: added timer for pause between firing projectiles. /n Tower_vs_Invador added remove  array elements if out of bounds, and fire mecanism for tower.
speed and behaviour optimizations
class name and comments
Simple jubula plugin to provide a substr() function

Is indended as a starting point for more...
Used string function to make core_konsultation_diagnose_addTI easier

Now it takes only the TI code as a parameter.
Also fixed search checking and retrying
removed pre compiled headers
new data source structure
Add validations for model fields and tests to ensure validations
Continue imposing model data validation
Add a migration to impose DB-level e-mail uniqueness
Downcase e-mail before storing in DB to further ensure uniqueness
Add bcrypt gem
Add a migration to include password digest in DB
Update DB schema
Add numerous (failing) tests describing user passwords
Continue adding (failing) tests for user password
Update password model to pass tests
Update teste_etapa2.txt
rest api debug flags + new jsonkit
small commit to heroku
changed the aws folder
changed the aws folder
loading new designers and hopefully the right images
loading new designers and hopefully the right images
loading new designers and hopefully the right images
small test
small test
small test
small test
small test
small test
small test
small test
small test
small test
new gem
new gem
new gem
token and secret in designer
removed one 'template-layer'
added giraph dir description to readme
fixes for giraph
Merge pull request #22 from honkdamonk/master

Property of Collections
fix in recent commit from Martin
giraph backend bugfixes
Merge branch 'master' of https://github.com/stanford-ppl/Green-Marl
Merge pull request #23 from janlugt/master

added vertexinputformat for giraph, bugfixes
fixing adamicAdar crashing problem reported by Adam
Merge branch 'master' of github.com:stanford-ppl/Green-Marl
Added optimization that avoids creation of an unused empty collection when the variable is instantly assigned to an entry of a property of collection.
refactoring + cleanup
Merge remote branch 'pullstream/master'
adding instructions on permissions for templeton files on hdfs
Update health test to ssh into instance
add ssh module
Merge branch 'build' of https://github.com/hpcloud/reddwarf_lite into build
Merge commit '1b8ac1711d612f16cd433ae4f7d23569dfb9a75d'
using strings instead of symbols for settings hash to be consistent with rest of gem
made sizing work for regular laptops ;)
Merge branch 'master' of github.com:hunterloftis/tetrinet
Added section on local ui classes
Merge branch 'master' of github.com:hypesystem/SliceOfPie
funcionalidade de twitter implementada a integração e criação de conta no twitter

- tentativa de criar a leitura na Yaml também, sem sucesso
coloquei o schedule rb ai pra testar
Correcao no script de inicializacao.
started the command line admin thingy
Added Halo: Reach remake and JIVE Idea
close the previous
simple refactor and fixes. Comments added
Russian locale added [Ilya Cherevkov]
Add fade out to titleScreen
add background texure
Fixed starting bid enforcement
Calling it 2.1.1
work on the Windows port
fix package dependencies

"connect" package doesn't currently have version 1.6.x available; "node"
current stable version is 0.6.x. The changes were necessary to fix "make
install" in a current invironment, babeld did work after that.
refactor chart js, add custom charts
Graph Abstraction: use interfaces
Merge pull request #3012 from Raven24/oembed-fixes

small fixes for oembed in posts [ci skip]
Merge branch 'show-more' of https://github.com/Raven24/diaspora into Raven24-show-more

Conflicts:
	public/javascripts/app/views/content_view.js
remove unused expander plugin
Merge branch 'Raven24-show-more'
remove the swallowing of generic messages from facebook and twitter postiing.  I want to know why sometimes these things are failing
make the invite flow not look totally terrible
fix legacy routes for old invite links
Merge pull request #3026 from SuperTux88/fix-old-invite-routes

fix legacy routes for old invite links [ci skip]
some sad fixes for webmock in the facebook service spec
Merge remote-tracking branch 'upstream/master'
updated 8 locale files [ci skip]
Merge remote-tracking branch 'upstream/master'
Give the README some tough love.
I am a jerk and I told someone to take this out last night fixes #3027
Fixed translation missing back-to-top
Add translation to "Mark unread"
Update config/locales/diaspora/en.yml
Añadida traducción en castellano para comprobar
Merge pull request #3029 from movilla/master

Fixed translation missing back-to-top and add traslation "Mark unread" /app/views/notifications/index.html.haml
refactor locale initialization and selection a bit
ehealth2012 + generic_states_experimental initial setup
Admin ui. Show list for key entities.
extended schema to parse configurations via AttributeTypeResolver
Added some dirty to field namespace but things should workout just fine

ForeignKey and OneToOne only return something other than None
if field is null=False. This helps avoid recursion problems.
Fixed tests for OO model_mommy

New tests must be added and old test should be checked
individually.
commit some new stuff
Merge branch 'master' of github.com:ivanhanigan/ada-nceph
baru lagi aja
part 2B desciption
update constants
update called constants
update dashboard widget
RestKit Added
Model 추가
View 수정
Merge branch 'feature/diary_write' into develop
모델 수정
Diary 목록보기 구현
Merge branch 'feature/diarylist' into develop
version change
Merge branch 'release/0.1.0'

Conflicts:
	Couple Diary.xcodeproj/project.pbxproj
	Couple Diary/LoginStoryboard.storyboard

Signed-off-by: Jaemyeong Jin <jaemyeong@me.com>
Add Makefile [PERFECTIVE]
notes
Merge branch 'master' of github.com:jaredp/PythonCompiler
work on program generation
more relationship links, style them
Update .gitignore to remove *practice* files
Update to support XSL templates
Problem 25 in PHP.
Problem 10 in Go.
Problem 13 in Go.
Problem 16 in PHP.
Problem 20 in PHP.
Add projected local bot, move update of bot position and orientiation into common bot.
Adding PHPAPI to declarations
Modify connection handling.
COURSESPLT-5 Added school title to departments
COURSESPLT-5 Added course code to course title
COURSESPLT-5 Moved term select above listview
COURSESPLT-5 School and course codes now uppercase
White space...
COURSESPLT-5 Styled course code and title
Add RSS alternative and remove dead Twitter JS
Added new icons, fixed some spelling issues and removed unused code
Modified pom for releaser
Copertura
Copertura
More copertura
Changed Action Bar Icons and fixed Menu Icon
probable fix for the panel offset bug
Merge pull request #150 from jeremytregunna/hotfix/position-bug-panel

probable fix for the panel offset bug
probable fix for the insertion order problem with hashtags and usernames. was not resetting the captured range in all places i needed to be.
Merge pull request #151 from jeremytregunna/hotfix/hashtags-insert

probable fix for the insertion order problem with hashtags and usernames...
fix bug where tapping user in stream post multiple times, loaded multiple profile views. Now it only loads one, and shows a HUD when the profile is being fetched
Merge branch 'master' of github.com:sneakyness/AppApp
This commit contains three fixes for autocomplete.

1. When typing a hashtag somewhere in the message, it puts it at the start
2. When typing a username inline, it would send your cursor to the end of the line after typing @
3. When typing a username it would put the username at the end of the line.

Please accept my humblest apologies, my testing should have covered these and it missed them.
Merge pull request #152 from jeremytregunna/hotfix/hashtags-insert

This commit contains three fixes for autocomplete.
Merge pull request #16 from jeroenbourgois/master

Updated readme
added submodule update explenation to readme
gitignore
Merge pull request #17 from pierot/gitignore

gitignore
Merge pull request #1 from proximitybbdo/master

up to date with proximitybbdo/engine
Update HelloJerry/HelloJerry/src/hello/HelloWorld.java
I did this work on the plane
but now I am at the bar and I don't remember what it was about.
Deleted files are a whole 'nother ball of wax
Fixed wrong README file mentioned in manifest template
gitignore update to exclude Visual Studio's trash files from the repo.
Added source code and Visual Studio project files to the repo.
Updated the README to actually say something.
new branch
Merge branches 'master' and 'tmp'
test 
fragment가 있는 경우 포함
broadcast receiver 추가
Initial commit of non-mapping pipeline code.

This prototype code operates independently from gbtpipeline.  It is
designed specifically for GBT extragalactic H1 OnOff or OffOn
observations as a starting point for a more generalized non-mapping
pipeline.  The final product is a SDFITS formatted spectrum for each
target in an observation.  So, if an input file has many total power
integrations for 12 targets, then the output will be a SDFITS file
with 12 rows, each representing a calibrated spectrum for a single
target.

The quick-look pipeline features RFI excision using two rudimentary
methods:

1) We examine each integration for broadband RFI (excessive
spectral baseline ripples) and flag integrations based on the total
power low-order Fourier components.
2) We flag narrow-band RFI using an iterative median filter approach.
Add systemXHR as permission. Don't know how image retrieval is working ...
Added some example stats and information to the zombie.
show more function
bug fixing
Merge pull request #8 from riddlore/master

bugfixing  und umblättern
added some useful classes to create a dynamic library from the generated source code
updated makefile and bumped debian version
added the new folders to be checked by the bin scripts
Added control block (only frame).
Moved initialization from BlockEditor to main.js.
Enabled block adding to ControlBlock.
Added simple eval.
Listing buff source, delete button in dashboard

Consolidating DM scratchpad and party buff tabs into one dashboard.
Adding delete button with confirmation to buff list in dashboard.
Defaulting 'enemy?' checkbox to checked for Jon's sake.  Displaying the
source character name for buffs in buff list.  Removing some debug
statements.
Updated the order of the -prefixed box-shadow

Set the w3c prefix free property to the last property for box-shadow
Remove backup rubygems path
Revert Remoting 3.2.10 upgrade
AS7-5283 Add -server when launching domain processes on IBM JVM
exclude transitive hibernate dependencies
Ignore exception if the dependency is optional.
i18n the SCIDP.
AS7-5341 export-native-configuration jgroups operation does not include properties specified via socket bindings
[AS7-5272] fix validate-address
[AS7-5349] Upgrade HornetQ to 2.2.19.Final
[AS7-5352] IllegalArgumentException in AS7MetadataRepositoryImpl
Fixed typo: get grouping handler config instead of broadcast group config for grouping handler.
[JBPAPP-9375] Don't allow handlers to be assigned self.
[JBPAPP-9351] Fix recursive invocation.
[AS7-4925] - Allow log4j appenders to be used as custom handlers.
Fix AS7-5348. Correctly add root cause to remote arquilian failures.
AS7-5323 component upgrade of Hibernate to 4.1.6
AS7-4967 Upgrade Infinispan to 5.1.6.FINAL
AS7-5358 Upgrade PicketBox to 4.0.12.Final
Fix AS7-5341 implementation.  ServiceContainerHelper.wait() and associated service listener were not necessarily syncing on the same object.
Changed "ContextMenuItems" to a dictionary item to make the "contextmenu" feature work
Merge pull request #448 from quangvhg/patch-1

Changed "ContextMenuItems" to a dictionary item
Changed data adapter to store information.
Added a title helper
Correcting stylesheet
improved the OO example
updated the Element class to call the _init method so the subclasses could use it to set their own properties once the object is ready
improved the OO example
Changing quickplay to play and removing betting system that was never implemented
adicção de exemplos e slides das aulas
added new slideshow, carrousel and plugintemplate
added depage-player to plugins
various small enhancements

- removed depage-base (no need anymore)
- added semicolons for save minimization
- added vim marker
updated depage-player
Added messaging classes providing the basis for a simple private messaging system.
Added get_by_id() function to auth_user class.
Merge branch 'master' of github.com:depage/depage-cms
Added xml_nav class to transform XML navigation poject structure file to HMTL nav layout. Added get_escaped_url() method to html class.
changed order of html::link() params.
Added getParams() method to depage ui - enables url arguments for sub handlers. Added more exceptions to graphics classes.
updated i18n to merge en_US too
fixed url of stepnav when using base-element in html
xml_nav: removed slash as default parameter for url
Merge commit '9d05609d797d3e6a86ca5e01326d78ea5a6355c9'
depage-player: enhancements

- added listener to "space"-keypress for play-pause
- fixed assetPath when depage-player.js is not included directly
depage-player: enhancements

- added listener to "space"-keypress for play-pause
- fixed assetPath when depage-player.js is not included directly
added new textbutton-plugin based on plugin-template
added new textbutton-plugin based on plugin-template
depage-forms: small enhancements

- added exception when validator is not callable
- made valid public
depage-jquery-plugins: added new details plugin based on plugin-template
depage-jquery-plugins: added new details plugin based on plugin-template
un commented bronze and gold app links in about section
started new gold app design
added thumbnail grid to bronze app
fixed export without transformation blur
updated to look like MINI

Signed-off-by: Chris Jones <chris@jonezy.org>
Added check to make sure title tag is present.
Include user/pass auth
mutable detection in lambda functions
REF: robust covariance, return only cov, drop bse from return (prep. for result method)
Changes: Different arrows experiment
Movidos ejemplos a una carpeta especial
Adicionando os arquivos do trabalho9, pronto.
initial commit with some files created
fixed cproject
no idea what this does
work on shaders.
added logger
created string.h
logger setup
moved shaders to resources folder
added log.txt to gitignore
Added event related classes
Added game Settings and State classes
Added Object and Mesh classes
Added base parser class
Started working on 3DS parser
added test model file
Using state manager and separated run from render
corrected instance declaration
added parser for testing purposes
added mapcoord
added mapcoord
Saved universe of genes with GO mappings
New .json networks. New program, sweepR.m.
Modified rampOptimalU to be able to plot cost versus iteration. Propagated changes to other programs.
getting mvn to build
delete a file
settings.xml renamed prefs.xml
Fix whitespace
Vibrate 500ms on alarm or timer
launchMode="singleInstance"

Let there be just a single instance of the clock view.  If the user goes
Back from the clock, there should never be another instance of it in the
stack history.
Show Chronometer at event time, using AlarmManager
Update grpjdfNEJDBZJBHFBJSZJFNKFNJEHEYGRdjfhgzy813T73NDJBDHQ.php
Fixed up project pages, added project slug.
Merge branch 'mysql' of github.com:julython/julython.org into mysql
考虑到python-requests存在过期依赖问题，改用curl进行网页下载
add python-mode.
add ruby mode.
set dev-startwire.com as domain for iframe src
fixing VIE loading
Handle .ssh directory not existing.
Merge branch 'libssh2' into sandvox2-maintenance
Merge branch 'sandvox2-maintenance' into develop
Describe current situation with CK and archived branches.
Fix postoffice database config for RelStorage.
Bump version.
Remove stray print statement.
-last commit before send it
avoid id index and convert between neo4j and our id
Added :timeout-argument to threadded timeout-method. The code will timeout within the given timeout of that happens.
Roles from settings .ini file, example development.ini: kata.contact_roles = Author, Maintainer
restructuring lib code into lib/
sadly moving junk all about
Give property list formats its own type

Instead of passing formats around as ints, create a Format type. There
are only 3 valid values, which have been renamed to OpenStepFormat,
XMLFormat, and BinaryFormat.
Add documentation for UnsupportedTypeError
updated the XML format
clearfix追加
文字数カウント関連の修正
More edits to Bucket List tutorial
Fixing DD pipeline multiple invocations bug.
add groonga, groonga.table
add grn-table-truncate
add grn-table-at
include .types
add GRN_CURSOR_*
add <grn-table-cursor>
add grn-table-cursor-next
add grn-table-cursor-delete
add grn-table-cursor-table
add grn-index-cursor-open
Remove the test.sh file.
minor cleanup + more seed entries + attempt at admin surveys
router print
Refactor spec to use shared examples
Refactor specs
WIP chapter 6.3.4
Make a basic User model (including secure passwords)
New gem groups
Finish modeling user
Finish user signup
Add SSL in production
Refactor sign up code
added StackOverflow test
Merge pull request #25 from kkuramitsu/master

Stackoverflow test is added.
first executing program
only do fast theora encode on non x86
some udp/opus quickhacktest fixes
Signed-off-by: kratin <mintra081@gmail.com>
Edit # 3 By Mintra
Merge branch 'master' of https://github.com/kratin/DemoRepository

Conflicts:
	Hello.txt

Signed-off-by: kratin <mintra081@gmail.com>
Fix Conflict by WinMerge
Added additional profiling messages and cleaned up superfluous debugging.
noooooooooooooooo
Merge branch 'master' of https://github.com/krobertson92/ECEN3000

Conflicts:
	DES/DES.v
	DES/db/des.cmp.rdb
	DES/db/des.map.qmsg
init laohujied
Merge branch 'master' of https://github.com/kuangrenxing/laohuji1
to show info
fix scroll to top on resize problem
Import missed introspection plugin. Fixes #1181.

--HG--
extra : rebase_source : b9dbc180a2d5603e61ca762905b44ddc30c76fd8
Entrega 5 SWCM
improve some styles, update readme
Updated HACKING.md to reflect reality a bit better.
Implement RedBlackTree.opEquals ...

... to actually compare tree contents. The current reference semantics
is not suitable for ==; for that we have 'is'.
Replace `if` with `static if` in `std.typecons.RefCounted`
Merge pull request #903 from denis-sh/pull-894-improvement

Replace `if` with `static if` in `std.typecons.RefCounted`
Remove variable shadowing in std.bitmanip
Merge pull request #907 from yebblies/bitmanip_shadowing

Remove variable shadowing in std.bitmanip
Merge remote-tracking branch 'upstream/master' into ldc-latest
Merge pull request #900 from quickfur/rbtree_opEquals

Implement RedBlackTree.opEquals ... (issue 8896)
Merge remote-tracking branch 'upstream/master' into ldc-latest
Acho que acabou...
update style sheet & left category filter
added test cases and fixed bugs
Fix #8 added ConnectionTab#requiredFieldsSet

sub classes implement this to validate fields before attempting to
connect to db
HTML slider version.
[examples] Added obldc strip led example.
[examples] Added systick example for obldc strip.
[examples] Added CAN example for obldc strip.
Update mailing list and www addresses
Tool actions can now be outsourced for don't-repeat-yourself-ness
FACES-1357
Develop 2.1.x branch in order to provide basic support for JSF 1.2
(icefaces1-portlet)
Changed version to 3.2.0-ga1 in order to reflect Lifeary 6.2.x based compatibility
FACES-1401
Upgrade from Java 5 to Java 6
Changed version to 3.2.0-ga1 in order to reflect Lifeary 6.2.x based compatibility
FACES-1402
Add default users to test-setup-hook
No commit
FACES-1357
Develop 2.1.x branch in order to provide basic support for JSF 1.2
(Adding TCK classes back in that I originally thought could be removed)
FACES-1236
Mojarra h:outputScript renders src attribute with encoded URL which invokes portlet RENDER_PHASE on Liferay Portal
[Vector] implement all missing methods
[VM] throw correct exception in constructGenericType and constructProp
mk_hwpack.sh: compose hwpack within build/ as well
mk_hwpack: add support for .tar.bz2 hwpacks
mk_hwpack: install cedarx libs for linux

android has .a, so it must work differently
mk_hwpack.sh: add missing break
Track TI-RPC xp_getargs and xp_auth changes.

The short-lived svc_getargs2 (xp_getargs2) is now svc_getargs
(xp_getargs).  And xp_auth is removed from SVCXPRT.  Callers now
use the auth handle threaded on struct svc_req.
Фикс багов, оформление плагина Page
Фикс оформления и багов в шаблоне, изменено меню в блоке прямого эфира
Merge branch 'master' of https://github.com/livestreet/livestreet

Conflicts:
	templates/skin/developer-jquery/actions/ActionProfile/sidebar.tpl
	templates/skin/developer-jquery/css/common.css
Change generated filenames.  Put the phrases "expected" and "failed-diff" toward the end of the filename so files are more appropriately grouped when viewed in file managers and thumbnail tools (eg. gthumb)
Use bincount rather than histogram for comparing images on Numpy >= 1.6.  Continue to use histogram for earlier Numpy versions.
Cache results of previous {PDF|SVG} -> PNG conversions.  We can only cache the baseline images, since the test results are never the same twice given different dictionary orderings in the file.
Use python-ghostscript to convert PDF and EPS to PNG (if available).
Use the same gs process to convert all of the images from PDF to PS
Add a new kwarg to the image_comparison decorator, remove_text, which removes titles and ticks from a figure before comparison.  Use this throughout to make more of the tests less dependent on text differences.
Remove obsolete docs about using ghostscript library since using it doesn't seem to offer any speed advantage.
Fix tests after rebase
Fixed logformatting for non integer bases.
Review action.
Merge pull request #960 from pelson/issue_909

Fixed logformatting for non integer bases.
Reinstate the manual reference counting as discovered in #1054.
Merge pull request #778 from mdboom/tests-faster

Made tests faster
Document how test caching works
Completely remove some commented out code.
Merge pull request #1056 from mdboom/test-cleanups

Test framework cleanups
Merge branch 'master' of git://github.com/matplotlib/matplotlib
changed footer details
Deleted modernizr and changed planner.js for local development environment.
[net-misc/networkmanager] revision bump, should fix the problems with openrc
added SetFrame method
tsan: refactor cur_thread() -> thr


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@162017 91177308-0d34-0410-b5e6-96231b3b80d8
tsan: fix COMPAT shadow mapping for new memory allocator


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@162018 91177308-0d34-0410-b5e6-96231b3b80d8
tsan: implement RWLOCK annotations


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@162019 91177308-0d34-0410-b5e6-96231b3b80d8
tsan: fix COMPAT shadow mapping once again


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@162020 91177308-0d34-0410-b5e6-96231b3b80d8
tsan: support for linker initializer mutexes with static storage duration


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@162021 91177308-0d34-0410-b5e6-96231b3b80d8
tsan: better diagnostics for destroy of a locked mutex + a test


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@162022 91177308-0d34-0410-b5e6-96231b3b80d8
tsan: add flag to disable reporting of destruction of locked mutexes (some programs use that on a regular basis)


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@162024 91177308-0d34-0410-b5e6-96231b3b80d8
tsan: improve Go report format + fix build


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@162042 91177308-0d34-0410-b5e6-96231b3b80d8
Commit the source and CMake changes that will allow to build ASan runtime
as a shared library on Mac OS. This will provide an alternative to
mach_override.



git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@162091 91177308-0d34-0410-b5e6-96231b3b80d8
switch to gaug.es and remove about.html page
better clear cache
reformatted all files (except view-files and .js) from tab to soft-tab and made other format changes according to https://github.com/styleguide/ruby
reformatted javascript- and view-files from tab to soft-tab and made other format changes according to https://github.com/styleguide/ruby
Bump version to 2.3.beta3
Do not use rake db:setup. It just don't work...
Optional anchors
Turn on engine
Fixed data passing issue, lost fancy interfaces.  Need to figure out how to make Source not see consume and Sink not see Produce without duplicating code in Transform and without using multiple inherritance
Typo fix
Use mw-scons-tools for scons tools
Merge pull request #7 from obra/patch-1

Typo fix
Updated libthing reference
Merge branch 'master' of github.com:makerbot/Miracle-Grue
Merge branch 'master' into reprap-compat
renaming top level classes and promoting Gcoder
Split out graph optimize code for being generic
Spurs in loops
Spurs stored at each loop
adding submodules mana-core.git mana-ext.git waffle.git
more freebsd-9.1
fixed readme file
Added variant with full parameters
[s2458] Remove script for npc 8816. Will be handled by DB

Signed-off-by: Xfurry <xfurry@scriptdev2.com>

(based on commit cba08c8)
retina text tweak
Update bonfire/application/config/config.php

to spanish
remove link to german entry
renamed array username to user; removed user constants from smarty; use _SESSION.user instead
removed old code
Story #134 (Raphael/Mengqiu) change the names of the fields in the Create Account form.
iteracion 1, falta arreglar algunos features
POT, generated from r22217

git-svn-id: http://core.svn.wordpress.org/trunk@22218 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Fixes fatal error because of moving to a class
Updated to include Mono versions > 2 as compatible.
Removed unused Fix reference from Simple.Web.AspNet.
Added missing Fix/AspNet packages, fixed references in Sandbox.
Fixed XML comment warning.
Merge pull request #40 from ianbattersby/MonoCompat

Updates incl. Mono compatibility
[lookup] improve output by displaying details about the best match
Properly formatting the Readme.md file again
sorted online
Sort development dependencies in alphabetical order
spice-tools: Add client.c

spice-tools is used to test spice protocol, it includes
server tools and client tools.

This patch just initals a spice client tool, which has the
ability to connect spice server. But the code implementation
is very simple, so client.c also can be used for studying spice.

Signed-off-by: mathslinux <riegamaths@gmail.com>
Rework jump_to_track code.
TODO: All code depends on cwin due to the option aproximate_search. How can avoid it?
Just rename jumptotrack.c to pragha-filter-dialog.c
Use append_library_row_to_mobj_list() to add songs with middle click.
So, remove duplicate some code.
fixed resgister design
removed setup.py print statement.
Merge pull request #1449 from pelson/pytz_noise

removed setup.py print statement.
README -> README.md renamed.