labofsahil/github-event-dataset-2012 huggingface dataset:
Check if cwd is in a repo first and then call a corresponding add_*_segment.
trivial change to comment
fix typo in japanese trad to modern spec
more fun with chinese place geography spec
use unique names across specs for shared_context
add rake task for japanese tests
adding pip install...
Merge branch 'master' of https://github.com/suneel0101/django-buddy
adjustment of requirements
add states 16-20
remove redundant return output variable
Update documentation/faq/Faq.markdown
fixed for first release
add pry-rails
refactor
mysqlの設定をしないときはデフォルトの設定を使うように
revert in_photo_stack
add filter
support new yfrog url
fix regexp of yfrog
split some url types to blog and media
improve filter and print_current_state()
improve filters
specify name of feed
specify feed name
add speaker deck to media
fix in_last_urls
add nicovideo stuffs
improve filter and add ameblo and pixiv
fix regexp
fix pixiv filter
remove url param in callback and remove script tag before running jquery
use while to maximize generating_items number
adjust feed_item_max
use smaller size photo in twitpic
count fetched tweets
Add extension methods, fix typo and code format
separate hosts.template from other template files
added seq.pause()
Fix: Fix link to generated tutorial reports.

Reported-by: Hunor Demeter
Merge branch 'master' of ssh://office.taskjuggler.org/srv/www/vhosts/www.taskjuggler.org/htdocs/git-repos/taskjuggler3
Fix: Properly export working hours that are not hour-aligned.

Reported-by: Christian Moerz
Improve performance of isDependencyOf() method.
Speed improvements for inputs() and targets() methods.
Replace disabled System.out.println() with TRACE level logging
Allow trailing '/' in profile username.
Working on $_ENV and getenv().
star-kbc: Remove HOME key from devices in which it isn't a button

In other words... leave it enabled only for the SU660
Merge branch 'jellybean' of git://github.com/CyanogenMod/lge-kernel-star into jellybean
Update circuit information

Add links to the wiki and specific circuit pages
More accessible tables, with scope

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4189 2fea6a4d-a838-0410-917b-93a53c48e9d2
Latest Hive admin theme CSS files from upstream

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4130 2fea6a4d-a838-0410-917b-93a53c48e9d2
HTML5 header and footer tags, plus some 'role' attributes for better accessibility

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4131 2fea6a4d-a838-0410-917b-93a53c48e9d2
Validation fix and goodbye noscript tags

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@3925 2fea6a4d-a838-0410-917b-93a53c48e9d2
fixed outta bounds for UpdateBoard
Merge remote-tracking branch 'origin/master'
#216 for tooltips with ontology metrics
fixed bug in editing book users assoc
trial circles yml config
PR#5111: no more span around hX tags

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12887 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
other ideas negamax
forcing v0.7.1 because I am for some reason unable to remove tag v0.7
Adding two images.
cadastro de usuario, exercicio, licao
Fixed swapped labels on is_business address
Readme and todo additions
Updated download links to Milestone 3
Updated blog link
fix description
more description
redirect dev to release for M3
finally announce M3!
Merge branch 'master' of https://github.com/ceylon/ceylon-lang.org
news link on M3
front page links to M3
fix title
update for M3
update for M3
add a comma
Add services icons and acknowledgements
First round of design and text for the bubble design
Reorder buttons to match text
Remove explicit bubble shape on content bubbles
Make `Ceylon is` and `Ceylon has` title smaller
Put back <hr/> next to home titles
remove try online button (lack of space).
delete already god
integrate YOURS
Adapt changelog to empty_json_body fix
text implemented
always a msg
Merge pull request #12 from timothyclemans/master

fixed typo <= to <?php
Finished draft 1 of the robomancer UI, added some of the backend for Robomancer UI, re-worked some of the controls, and updated the landing page.
add delete user from queue for controlling users
Swapped out EF for RavenDB
perl_community.pod draft
Create a book-aware account object
Se agrega ayuda para mover las reglas
Try to save inquiry with owner.
Completed saving inquiry with owner
Merge branch 'TrySaveInquiryWithOwner'

Conflicts:
	BinaryStudio.ClientManager.DomainModel/DataAccess/MultitenantRepository.cs
	BinaryStudio.ClientManager.WebUi/Global.asax.cs
	Logs/BinaryStudio.ClientManager.log.txt
Changed saving email with Owner
Changed logic for creating Inquiry.
Fixed problems with query method in MultitenantRepository.
added new part of view model (#26)
update css and DashBoardController (#26)
added inquiry statuses
Added BubbleWrap as a dependency
added images and have Jack, Queen, King logged.
Fixed tsn/81 shownotes
Fixed translation of img coordinates to img frame coordinates; some other small tweaks; started implementing backtracing (not yet working)
Calibrator now reads in image width and height from same file as list of calibration points
Calibration of focal length and Tz broken; everything else should now function as intended.
Merge https://github.com/tohojo/image-processing
Some cppcheck warnings fixed, obsolete prefix_forwarding_enabled() removed.
Added Fibonacci generator
observe service_hooks.content.length
increase retries and timeouts for bluebox vm creation
Update HCatContext to use a reference to the job conf instead of its own conf, so this conf is available on the backend. Also, experiment using Optional as the return type for getConf because it might not be set, and this clarifies how to deal with the missing case.
Setup HCatContext in HCatLoader.setLocation too, which is needed on the BE.
Merge branch 'HCATALOG-497_context_conf' into HCATALOG-443_api_to_metadata_deserializer

Conflicts:
	hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/HCatLoader.java
	hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/HCatStorer.java
	src/java/org/apache/hcatalog/common/HCatContext.java
	src/java/org/apache/hcatalog/data/HCatRecordSerDe.java
updated branding on nav bar
added user controller
made background work. still need to make video go on one line
промо авторизация поп-ап
Cleaned up usage of MVC pattern. Simplified Settings view implementation.
When goal node is found, SearchTreeView is notified.
started going over the results
Add the 'activehref' templatetag for setting the active navigation element.
Condense some of the views and update the url paths again.
Attempting to fix jruby travis build issues (bundler not installed).
Merge branch 'master' of github.com:twitter/twitter-cldr-rb
Merge branch 'master' into bidi
Fixing travis log length exceeded error
Fixed packet size length in SMQ.
auto-update-2012-12-29_04-00-03
Moving Berkeley Base theme to standard sites/all/themes path
Edited upto lline 80

some initial editing
Added input and output formatter implementation and main method.
Added logic to generate multiple ticks.
Completed TODO and Updated README.txt
README modifications
Fix invalid username detection
adding Google Analytics
regenerating secret key on each server restart
lang menu
uncomment php
Added version number

Need changes to tables from previous commit, will commit again
Commented out package.xml patching as I made nessesary changes to releng in sf.net


git-svn-id: https://svn.java.net/svn/glassfishplugins~svn/trunk@537 081d56c4-be80-0410-83e6-e326f4057db8
Followup for issue 47 - new zip expanded dir name check.


git-svn-id: https://svn.java.net/svn/glassfishplugins~svn/trunk@538 081d56c4-be80-0410-83e6-e326f4057db8
Glassfish registry and initial V2 configuration plugin


git-svn-id: https://svn.java.net/svn/glassfishplugins~svn/trunk@539 081d56c4-be80-0410-83e6-e326f4057db8
* Changed line width to 120 columns


git-svn-id: https://svn.java.net/svn/glassfishplugins~svn/trunk@540 081d56c4-be80-0410-83e6-e326f4057db8
Removed Override annotations.


git-svn-id: https://svn.java.net/svn/glassfishplugins~svn/trunk@541 081d56c4-be80-0410-83e6-e326f4057db8
add more trace because current exception report is not enough


git-svn-id: https://svn.java.net/svn/glassfishplugins~svn/trunk@542 081d56c4-be80-0410-83e6-e326f4057db8
more trace


git-svn-id: https://svn.java.net/svn/glassfishplugins~svn/trunk@543 081d56c4-be80-0410-83e6-e326f4057db8
One temp directory was not handled correctly when being out of Eclipse workspace.


git-svn-id: https://svn.java.net/svn/glassfishplugins~svn/trunk@544 081d56c4-be80-0410-83e6-e326f4057db8
trying to debug a file path location


git-svn-id: https://svn.java.net/svn/glassfishplugins~svn/trunk@545 081d56c4-be80-0410-83e6-e326f4057db8
Another File.pathSeparator issue fixed


git-svn-id: https://svn.java.net/svn/glassfishplugins~svn/trunk@546 081d56c4-be80-0410-83e6-e326f4057db8
Enabled ant output to console


git-svn-id: https://svn.java.net/svn/glassfishplugins~svn/trunk@547 081d56c4-be80-0410-83e6-e326f4057db8
missing register component


git-svn-id: https://svn.java.net/svn/glassfishplugins~svn/trunk@548 081d56c4-be80-0410-83e6-e326f4057db8
mac


git-svn-id: https://svn.java.net/svn/glassfishplugins~svn/trunk@549 081d56c4-be80-0410-83e6-e326f4057db8
missing files


git-svn-id: https://svn.java.net/svn/glassfishplugins~svn/trunk@550 081d56c4-be80-0410-83e6-e326f4057db8
more trace to understand why we have an exception...More work needed for good error handling and logging


git-svn-id: https://svn.java.net/svn/glassfishplugins~svn/trunk@551 081d56c4-be80-0410-83e6-e326f4057db8
local log implementation. For some reason, cannot depend on the other plugin to give these apis


git-svn-id: https://svn.java.net/svn/glassfishplugins~svn/trunk@552 081d56c4-be80-0410-83e6-e326f4057db8
critical ant/ dir missing...


git-svn-id: https://svn.java.net/svn/glassfishplugins~svn/trunk@553 081d56c4-be80-0410-83e6-e326f4057db8
adding register module and no jmaki for now


git-svn-id: https://svn.java.net/svn/glassfishplugins~svn/trunk@554 081d56c4-be80-0410-83e6-e326f4057db8
Added missing license information to .java files


git-svn-id: https://svn.java.net/svn/glassfishplugins~svn/trunk@555 081d56c4-be80-0410-83e6-e326f4057db8
*** empty log message ***


git-svn-id: https://svn.java.net/svn/glassfishplugins~svn/trunk@556 081d56c4-be80-0410-83e6-e326f4057db8
Fixed issue with loading multiple documents.
Get ready for Ruby 1.9
Replace RCov by SimpleCov
Add a note about audio normalization
elimino a3
agrego segunda linea
Correção do nome do campo em Estrutura Organizacional
Revert "arm: kvm: Update kvm/arm headers."

This reverts commit 5fde876496ab05b56b90146a00e1dc983874b2d2.
arm: kvm: Update headers to includ kvm_reg_list arch-generically

Signed-off-by: Christoffer Dall <c.dall@virtualopensystems.com>
arm: kvm: Update headers: KVM_SET_DEVICE_ADDR

Signed-off-by: Christoffer Dall <c.dall@virtualopensystems.com>
target-arm: Use MemoryListener to identify GIC base address for KVM

When using an in-kernel GIC with KVM, we need to tell the kernel where
the GIC's memory mapped registers live. Do this by registering a
MemoryListener which tracks where the board model maps the A15's
private peripherals, so we can finish the GIC initialisation
when the GIC is actually mapped.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
arm: kvm: don't call init_irqchip and update header

The KVM_INIT_IRQCHIP happens transparently now.

Signed-off-by: Christoffer Dall <c.dall@virtualopensystems.com>
Add (empty) favicon
Updated build scripts to compile cache manifest automatically
Updated build script: separated build and deploy targets
Fixed problem with scrolling in tabs
We don't want to break the loop.
compass installed
sass gem moved to assets group
compass integrated
New baground task processign system
Merge branch 'master' of github.com:vshcryabets/V2AndLib.UI
* Moved from internal templating to jQuery.tmpl plugin
* Added sub-match indexes in the result view
delte Hello.java
Point robotics at the right subdomain
only output the new file name
Revert "only output the new file name"

This reverts commit 13323e8fefacbb7137a32edc6a687f26b653cc72.
Keyboard: Calculate size relative to screen

Open-webOS-DCO-1.0-Signed-off-by: Josh Palmer <jpalmerwatkins@me.com>
added use strict. Tweeks till 100% in jsHint
Fix parts of issue 635, mostly by deleting hacks that are now obsolete

R=dimvar
DELTA=6185  (2271 added, 2886 deleted, 1028 changed)


Revision created by MOE tool push_codebase.
MOE_MIGRATION=5763


git-svn-id: http://closure-compiler.googlecode.com/svn/trunk@2304 b0f006be-c8cd-11de-a2e8-8d36a3108c74

1. Cleanup some JS compiler warnings due to wrong/missing types.

R=primmer,huska,mhermanto
DELTA=43  (16 added, 15 deleted, 12 changed)


Revision created by MOE tool push_codebase.
MOE_MIGRATION=5764


git-svn-id: http://closure-compiler.googlecode.com/svn/trunk@2305 b0f006be-c8cd-11de-a2e8-8d36a3108c74

Refresh indexdb externs as the spec seems to have changed.

Committed externally by Chad.

Revision created by MOE tool push_codebase.

R=johnlenz
DELTA=32  (12 added, 8 deleted, 12 changed)


Revision created by MOE tool push_codebase.
MOE_MIGRATION=5765


git-svn-id: http://closure-compiler.googlecode.com/svn/trunk@2306 b0f006be-c8cd-11de-a2e8-8d36a3108c74
Fold a switch whose condition is a constant. Fixes issue 271.

R=nicksantos,johnlenz
DELTA=167  (157 added, 1 deleted, 9 changed)


Revision created by MOE tool push_codebase.
MOE_MIGRATION=5832


git-svn-id: http://closure-compiler.googlecode.com/svn/trunk@2326 b0f006be-c8cd-11de-a2e8-8d36a3108c74

Bugfix for switch cases with empty bodies


Revision created by MOE tool push_codebase.
MOE_MIGRATION=5833


git-svn-id: http://closure-compiler.googlecode.com/svn/trunk@2327 b0f006be-c8cd-11de-a2e8-8d36a3108c74

Turn "misplaced type annotation warning" on by default.

R=nicksantos
DELTA=869  (532 added, 97 deleted, 240 changed)


Revision created by MOE tool push_codebase.
MOE_MIGRATION=5834


git-svn-id: http://closure-compiler.googlecode.com/svn/trunk@2328 b0f006be-c8cd-11de-a2e8-8d36a3108c74
working on lasso for glimp.r
Documented some stuff (including partition information - please read! (located in /notes))
misplaced some libs? check latest logcat
re-size made much more dynamic
dynamic re-size
Merge branch 'master' of https://github.com/whey/Golden-Grid-System
dynamic re-size added
Collect all the external libraries under a "lib" target

Also, rename individual libraries to "ext_*" instead of "*_build".
Fix for Exception switcharoo

Nose converts things that aren't exceptions into exceptions so this
better handles that case.
adds better download url using SemVer tags
Complete the jump back for ace jump

As the original mark facility cannot jump through frame and window.
Now I add the jump back function to ace jump itself, which can help
you to jump back through window and frame.
Last Day of Peachtree. Stable Autotarget
POST-PEACHTREE AWESOMENESS
[maven-release-plugin] prepare release praqmajutils-0.1.27
[maven-release-plugin] prepare for next development iteration
Merge branch 'master' of github.com:Praqma/praqmajutils
updated samples with correct property ordering
updated to proper model property order
List::AllUtils not used so it was removed, dist.ini updated with dependencies
sources and workouts
Eclipse does not seem to understand <> introduced in JDK 1.7
jlist as double linked list
more work, now intersections_join work
Replaced "knj/datet" with "datet".
adding parent in prereq since it's used in a test
use older syntax, this should still work the same
reflect changes
up version
add yaVDR-db check
force rebuild
remove ","
Update yavdrweb-ng/static/javascripts/component/system/diagnose.js
- remove 1 billion useless comments
- add support for scaled icons
some small fixes
add "very small"
Merge branch 'master' of git@github.com:yavdr/yavdr-webfrontend.git

Conflicts:
	yavdrweb-ng/static/javascripts/base.js
	yavdrweb-ng/static/javascripts/component/system/diagnose.js
change default icon size
fix chrome translations JS support
cleanup
spanish translation thx jbjbjb
remove wrong divert
move tntnet.conf to utils (template)
change rescan displays
revert changes
fix
FIX IE8 / 9
add event to set_autofs_config
add softhd
[Feature] adapted smtp setting for heroku mailgun
Add simple item class containing item, titleframe and title
A better IO explanation.
fix biginsights folder
can tell you whether your crossword has a solution (haven't figured out how to print the solutions yet...)
Final paper v0
Merge pull request #63 from ysth/develop

BHG could place multiple decor in one plot
Slight tweak in order of rechecking plot count after building.
Merge pull request #64 from lemming552/develop

Slight tweak in order of rechecking plot count after building.
Redoing Crud App
"progreso"
sample version just says how to get the book for free
removendo tag desnecessária
Added Dominic Chianese to the graph.
delete some files
2
fixed small edit expiration error
Add getDataDict() in each model, do not need to construct a new dict by hands every timegit add .
course/getAvailableList return how many students have taken the lesson
Added egodatabase
update MUKit
Added localhost as the mailserver to relay alerts through.
Added min_height to tabbedview-body. Grey-out the tabbedview-body while loading a new tab.
Merge pull request #12 from 4teamwork/jin_tabbedview_minheight

Min-height in Tabbedview-body
derp, pushed to master last time.. sorry bout that.
using urljs, fixes wrong url link for bamboo
corrected error message logged
remove "build failed" sticky notification if build already fixed
show animation when waiting for project list
translations: Add FF1 translations guide.
Fix jQuery problem with some themes
Map Generator - Basic Map Only
Corrected a bug in POST with length 0
urls attribute added to ConfigRunner
List class gemaakt

[] operator moet nog gemaakt worden
ticket_6 creating my own calendar widget
<< Setting the UpdateValues method >>
Fifth Attempt

I feel as though my very soul may have left and now I'm simply a
republican.
- Modifications dans la quasi-totalité des fichiers
- Suppression de metiers-grands-comptes au profit de "international"
Added is_extending parameter (default = false) to :initialize_inheriting_instance.
Fixed configurator

Configurator now properly loads yaml files from the config directory. Updated .gitignore to ignore our twitter credentials. Switch yaml parsing libraries and switched from HTTP proxy modules to twitter API wrapper

Signed-off-by: Michael Filbin <michael.filbin@gmail.com>
neleidžiama saugoti recepto be pavadinimo
neleidžiama saugoti recepto be pavadinimo
neleidžiama saugoti recepto be pavadinimo
Merge branch 'master' of github.com:AtvirasAlus/Atviras-Alus
Very vague implementation of the spambot itself, low functionality, seems
to mainly serve as a platform for the other classes to launch from.
Removing old Geo.js
adding some instructios
Merge pull request #1 from coolaj86/patch-1

adding some instructios
Replaced deprecated v1 with v2 BabelFx for Swiz

All legacy versions of BabelFx (v1.x) have been moved to `legacy` branch.
Master branch is now BabelFx v2.x - deployed as Swiz extension framework
Fixed new Card Button Bug
Fix'n derps, v2 avaliable on iTunes shortly
the growth direction
This line was too large
Reminders module was removed, remove associated locales
OneExtraActionBar: Fix visibility settings
uploaded littlewire to this build and it totally works! micronucleus can totally host usb projects! Everything works I think!
important Fixes and stuff
Allow users to update name of a release
Added defult host for mailer
Update the README by removing crap
cambodia part two
404 page and minor tweaks for template
Finished commenting, going to start real changes

I have commented everything that I learned, and I have also
cleaned up (mostly just visually) the code. I am going to
start implementing the changes that have come to mind since I
started working on this.
Updated lib.tasks.isis.schedule_reader Documentation

Fixed the documentation so that the ISIS schedule_reader day fields
are no longer listed. (They were moved to lib.tasks.courses.Days)
Made lib.browser.plugins.keepalive.handler doctests work in py3k

When the module was intitially ported, the doctest strings were not
updated to py3k. The documentation for the module should really be
moved over to ReST, but there's a good chance I'm going to drop the
module soon, as we'll likely be moving over to Requests, so it's
not worth the effort.
Fixed slices with lib.tasks.courses.CourseList

Expected behavior was that slices would give CourseList objects,
but they ended up giving list objects.
Added tutorial for the lib.tasks.courses module.
modified stylesheets partial
Ajout suppression des abonnes et films
fix dashboard-block margin-right to be displayed correctly on smaller screens
Add molokai color scheme.
Change last remnant of initial-db-sync to nova-db-sync
Merge branches 'dev' and 'newpages' into dev
Merge branches 'newpages' and 'dev' into dev
Fixes the save_ice_time action in ajax controller
Modifies get_cal actions in ajax controller to be more efficient
Changes some scandinavian chars into html chars
Merge branches 'dev' and 'team-calendar' into dev
Adds logic for returning to manage news from editing when edit is saved successfully
Modifies the functionality of returning from update news to use session variable to give the user feedback
Adds delete icetime button
Merge branches 'dev' and 'team-calendar' into dev
Merge branches 'dev' and 'news' into dev
Merge branch 'dev', remote-tracking branch 'origin/dev' into dev
Adds player seeds
Merge branches 'dev' and 'add_player_seeds' into dev
Adds some code to manage staffs page
Adds seeds and the staffmember model
Merge branches 'dev' and 'add_staff_seeds' into dev
Adds staff member stuff all over the palce
Adds manage staff stoof
Merge branches 'dev' and 'manage_staff' into dev
[maven-release-plugin] prepare release jangaroo-tools-0.9.12
Update Readme, add Query script

Added MySQL query scripts.
Updated readme
remove the requirement of form class="full-form" so it can be replaced with div class="full-form" for .net
fixed holder
Fixed a few line spacing bugs.
added note about pageProgression
Tried to fix nav issue
Example of adding label showing map name on mouseover
asdf
asdf
asdf
dddd
Validation on Contractor form.
more changes to experiments
ADMIN: remove unrequired builders
Some color update
Umstrukturierung der Ortsfunktion zur besseren Wiederbenutzbarkeit

Vorbereitung für die Routenfunktion, außerdem kleinere Funktionen bei der Dateneingabe.
Neue Variablen zur besseren Berechnung der Koordinate eines Pins

Die neuen Variablen sind map.scaling.scaleFactor und map.panning.x bzw. map.panning.y
Merge branch 'master' of https://github.com/DomiBosselmann/Kartenapp
Check ob User einen Browser oder den Internet Explorer verwendet
(Internet Explorer wird nicht unterstützt)
Ajouts peuples et pouvoirs
Replaced delete with splice in map view, added some more styling to the list view
Merge pull request #4 from mmorey/master

Replaced delete with splice in map view, added some more styling to the list view
Removed the open func from internal modal.

This was removed so that a developer wouldn't mistakenly think they
could call it.
remove the auth for business path

make small change for share video
Ryddaopp og fiksa
Added realationship status/users
Edited Kinect, need links on dashboard for OI Kinect and gain values
changes to oi
SmartDashboard & Kinect
doesn't work...
Merge branch 'master' of github.com:Fafinou/NPJProject2Trade.git
It works !!!!
still buy to finish ...
Did unregister also
correction of a little bug
Metadata updates
dev-haskell/split: added missing manifest (noticed by nand`)

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
big mirror update
ghc 7.6.1, currently experimental, needs testing and keywords
app-admin/haskell-updater: bump up to 1.2.0.7 (ghc-7.6.1 support)

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
haskell-updater: fix Manifest (forgot to add checksums)

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
ghc 7.6.1 needs cabal 1.16.0 snapshot, TODO: please add keywords
haddock 2.11.0 on hackage wants base < 4.6, ghc 7.6.1 needs haddock 2.11.0 snapshot from ghc src tarball
dev-lang/ghc-7.6.1: added amd64 binary

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
binary-0.5.1.1 is a ghc 7.6.1 core lib, make it dep on >=ghc-7.6.1 to installing it on with <ghc-7.6.1
Like Bug 420073: make cabal-1.16.0_p20120907 dep on >=ghc-7.6.1
deepseq-1.3.0.1 is a ghc 7.6.1 core lib, make it dep on >=ghc-7.6.1 to installing it on with <ghc-7.6.1
time 1.4.0.1 is a ghc 7.6.1 core lib
dev-haskell/x11: bump up to 1.6.0.1 (ghc-7.6.1 support)

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
dev-haskell/hpc: bump up to 0.6.0.0

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
cabal-file-th works for ghc-7.6
slyfox's suggestion: remove this block to build the profiling libs
fix haddock 2.11.0_p20120907 snapshot build for ghc 7.6.1
Bump haddock to 2.12.0 for ghc 7.6.1
rename the cabal snapshot to correct the date
Test commit for branching

Signed-off-by: Peter Mårtensson <veritas.is.me@gmail.com>
Started event based state changing. Added overridable events to GameState.cs.

Signed-off-by: Peter Mårtensson <veritas.is.me@gmail.com>
Merge branch 'dev' of https://github.com/FooKittens/Team_Practice into StateMachine

Conflicts:
	Teamcollab/Teamcollab/Managers/StateManager.cs
First version of statemanager completed. State changes working. StateManager is now used on game launch.

Signed-off-by: Peter Mårtensson <veritas.is.me@gmail.com>
adding Couchbase task classes from GES
adding some Couchbase testing stuff
adding some stuff to 0mq
add explicit instantiation for SBInterpolatedImage constructor for const pixel types
(#97)
wrap templated SBInterpolatedImage constructors
(#97)
mentioned kValue(), xValue() availability according to Mike's explanation (#257)
reduced wordy doxygen comments in include/galsim/hsm/psfcorr.h (#10 and #20).
more standardizing of doxygen comments in include/hsm/psfcorr.h (#10 and #20).
some more explanations of quantities in include/hsm/psfcorr.h (#10).
working with live data
Added LogoUrl to Publisher
removed old stuff from extension module.
deleted some old unused kernels.
changed the order of some tests of extension module.
reset game modes when you take the site down
Fixed a multi-threading bug

was simply adjusting the global controller before running it, but if
multiple people are accessing the global controller, would result in
bugs
fixed a couple of bugs and simplified the controllers

had incorrectly named layouts
also, finished wasn't being set in the heart correctly, so moved it
into the vars
fixed a couple of small bugs

making sure that the user controller doesn't accidentally double dip
with finishing funds

also, making sure that calls that later middleware make don't affect
the finish
added ItemPath tt
.
some
Convert the last remaining function to use a promise
Support libemoji_docomo
Make package.json point to the correct world-readable git repos.
Refactor to produce "rfcq", which allows querying a draft via jQuery selectors.
fixing $this error and code format
CBQE-246: add view query test for skip parameter

Change-Id: I36dc6bfced96f72db5858fb5f0db314a03b64dd2

Conflicts:

	conf/dev-py-viewquery.conf
Merge branch 'master' of github.com:IrynaMironava/testrunner into b2
new conf
Problem 7 Works
Started a bit of prework on refractions
http://support.jahia.com/browse/EFG-51
Fix 'apostrophe' issue
Support for cross-browser viewport units

Fixes #19.
Removed side effects from increments

No longer modifies the template so template objects can be reused
Alles werkt nu behalve dat het niet werkt.

Knopjes doen niks en dat hangt de boel enorm!
Made functions to create the clipping planes
changed a small error
fixed memset/memcopy
horrible workflow
gps throws error if no clue
gps unknown lock stuff
Rearrangig code
Added Android Image Support

It's now also possible to share local images on Android (example can be
found in the Android/iOS example project)
several changes
Added PresentActionSheet script
Added Present ActionSheet Function
Update to example project and source
Changes committed to native/js folders
small changes if code formatting
Добавлена функция filePublish для публикации файла
Добавлена функция fileUnPublish для закрытия опубликованного файла

Added new methods for file publishing / unpublishing:
filePublish
fileUnPublish
Update assets/create_file.c
Update assets/inode.c
Merge pull request #1 from salij/patch-4

Patch 4
Merge remote-tracking branch 'salij/patch-3'
updated readme
Merge remote-tracking branch 'salij/master'
Add dependency on testing to release target.
Remove patch file that was added by accident.
changed semprmm_pipeline.py studies_to_setup so that it will run for studies that are missing runs
fixed critical bug in art2tpef.m
semprmm_pipeline.py: 1) Included fir analysis in fsfast analysis steps 2) Updated 'make spm surfaces module' ( under construction ) 3 ) Other minor changes
Created _posts/core-samples/2012-07-10-prose-introduction.md
Add URL?
NP rewrite

Rewrite from UDP to Named Pipes.
[uk] initial commit
Update music editor to work with new libgamemusic architecture
Lower minimum version for libxml prerequisite
libreria de banner sidebar
imagenes de oficina
script de banner de oficina
Deleted files and reorganisation
Metapopulation model with random MaxEnt scores for each lek
Metapopulation model with stable MaxEnt scores for each lek
Metapopulation model with no influence from MaxEnt scores (i.e not affected by habitat)
Metapopulation model using Scenario 1 (reduced grazing)
Metapopulation model using scenario 2 (increased grazing)
Metapopulation model using scenario 6 (increased closed canopy forestry)
Metapopulation model using habitat in 1994
Start and control code for metapopulation model
added more test benches
Handlebars added + commented route
user can delete himself
Turned into a project in Sublime Text 2
erged
Small changes in connect server settings and dialog.
Added additional fix to publishing script
Create XY_Illustrator_0point
New changes for Arduino communication

Added some configuration commands, and changed the method of output on
the 9DoF. The parsing code has been updated to take in binary data
instead of text data.
Cleaned up Razor Code

Did some cleanup and moved unused output functions to Output_unused.ino.
Cleaned up parsing code

Removed text parsing code, shifted things around to make it more
organized.
[html] Fix up header centering a little, try sticking a random <hr> in
Replace debug message in Android build script.
routes fixed + bump 0.0.0.4
Now also supports old Stanza cover tags.
Now supports both Stanza-search and OpenSearch for OPDS sites.
Dead code
ALso imports from old PageTurner folder now.
Now also opens epub:// links.
Included 'buy' buttons.
Updated readme
Added 'prevent screen lock' option.
Fixed black border on pagechange on ICS.
Used custom Smashwords URL.
New translations.
Keep screen on no longer keeps the device on when not reading.
Fixed nullpointers.
Dynamically determines the path of the storage folder now.
Merge branch 'master' into 1.3_bugfix

Conflicts:
	src/main/java/net/nightwhistler/pageturner/activity/LibraryActivity.java
Updated version number
Removed more references to Octocarina

As well as references to the Master Fork.
Removed lists and added hardcoded tests for imgur paths and minus. Restructured code to use functions for the different parts.
Getting images from s3
Merge branch 'master' of https://github.com/Open-org/PhotoAccounting
delete unneeded config
Change function name
Change amazon library`
Merge branch 'master' of https://github.com/Open-org/PhotoAccounting
Merge pull request #138 from zoltax/master

Getting images from s3
Light goes to a "servo" device, so mapping should be 0-180
Merge pull request #49 from simonech/master

Fixing mapping of led values
cambios oskar
Merge branch 'alpha' of https://github.com/OscarMesa/MathForDummies into alpha
cambios
Merge branch 'alpha' of https://github.com/OscarMesa/MathForDummies into alpha
changed file tag to .png
removed debugging and updated api documentation
Handle 1 as single and don't append suffix
Adding INTERFACE_NODES_GET routine (similar to REGION_NODES_GET)

Tracker Item 2271
Backup before even testing
some minor edits with emacs
fix next link
fix xhtml prefixes
Merge branch 'master' of github.com:RESTFest/2012-greenville
1. Removed Maven POM files
2. Modified global ignore patterns to ignore eclipse and gradle metadata
1. Added Gradle build scripts for modules and project
1. Added support to check if a query exists in QueryStore
ICC: Fix Blood prince council
Fixed the separation with tabulators.
Fixed bundle id.
commit DS store
add more ot the default test install instructions

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
Add "progress calculator" tool to help update the progress section on the blog

Just a little JavaScript tool that will crunch some numbers.
remove otter due to evtest conflict
Aknowledgement + typos
Compatibility note and link to pairing utility
Had to repaste in spe_code, some realy weird stuff going on. Now testing Sun-Jupiter system
Adding scope for planets with_my_ships

A scope that joins planets with ships at the same coordinates
and removing a create ship from main.rb as it's throwing an
error with attack(ship_id).  TODO: check the error
ItemStack.asBukkitStack(null) should return Air. Fixes BUKKIT-3170
Implement ItemFactory and ItemMeta values. Adds BUKKIT-15
Clarify functionality in CraftInventory. Fixes BUKKIT-3097

Changes some NPEs to IllegalArgumentExceptions for exception consistency.

Contains(ItemStack, int) correctly calculates number of ItemStacks.

Adds a containsAtLeast(ItemStack, int) for finding a combined amount of a
single similar ItemStack.

Makes some utility methods private to prevent ambiguity in use.
Change enchantment comparisons to isSimilar. Fixes BUKKIT-3183

The purpose of the isSimilar method was designed to consider all NBT
data, not solely enchantments, without the need to have exact stack
size matches. The respective methods in CraftInventory were still
comparing enchantments instead of the ItemMeta.
remove unnecessary activity, add gallery activity
further work on gallery viewer
updated category generator plugin
Fix `console` stubbing method in oldIE

Expose `console` object to global scope in IE6 and IE7

Reference: gh-1229
Further improvements to `console` stubbing method

These improvements are:

- cache current method in `while`-loop to reduce property look-ups
- use `if` as the conditional assignment in `while`-loop in order to improve performance and readability

Reference: commit 578f377
Closes gh-1229
Merge branch 'console-stub'
Dashboardin tuotantosuunnitelmaan lisätieto rivin tooltipiks.
Added temporary todo element to spec.
Added morerows attribute to table entries in spec.
Minor Samples/LedIt/ makefile cleanups
RunAStyle
Checking for valid tag names with PCRE when using the XmlArray annoataion.
swap file_ext for get_ext so that it shows the extension again - jrbl reviewed
Merge pull request #1411 from Stanford-Online/jinpa-extensions-off-fall-master

swap file_ext for get_ext so that it shows the extension again - jrbl re...
email testing on jbau local -> dev
Change wording Publish->Ready like everyplace else
Merge pull request #652 from Stanford-Online/jinpa-work

Change wording Publish->Ready like everyplace else
Merge pull request #651 from Stanford-Online/sef-work

A couple of small changes made while working with @jbau

LGTM
optimizing tasks to reduce number of db accesses/email #559
Merge branch 'master' of github.com:Stanford-Online/class2go into jbau-celery-email
add link to email function under Course Admin dropdown #594
Merge branch 'master' of github.com:Stanford-Online/class2go into sef-work
added exponential backoff and task lists to retries to reduce repeat email #559
Merge branch 'jbau-celery-email' of github.com:Stanford-Online/class2go into sef-work
Merge pull request #662 from Stanford-Online/jbau-celery-email

Email using celery
Merge branch 'master' of github.com:Stanford-Online/class2go into sef-work
celery email task log stderr, if any, from lynx
Merge pull request #663 from Stanford-Online/jbau-celery-email

celery email task log stderr, if any, from lynx
Merge branch 'master' of github.com:Stanford-Online/class2go into sef-work
Removing old files from project root

Now that more people are looking at our source, all this old crufty
stuff at the root is just confusing.  Five trees removed that fit into
this category: css, js, examples, sample_video, and problem_sets.

Also nuking flypaper, my horrible creation, since the VM that it was
running on has now been decommisioned, and replaced by much better
content at http://class2go.stanford.edu/ (thanks Mike).

Chose *not* to remove offline since that has some JS that may be useful
when we bring that feature back to life.
take out dup delection in csv import# 768
a bit of code cleanup per @wescott
Burn down migrations for sprint-13

Done from app1.prod from production branch. 0001_initial tracks models.py
as of 104b42a3176ff339bbceda36613f38bd21c427e3.Z
make cs224n not redirect to preview page
Re-implemented Redirects from Conv. Domains #756
Move opening comment marker to re-enable dropdown menus

	modified:   c2g/static/css/core/responsive.css
Merge pull request #761 from Stanford-Online/production

Burn down migrations for sprint-13
Merge pull request #760 from Stanford-Online/jinpa-work

preview content for nano - but I suspect he probably really needs to tur...
Merge pull request #757 from Stanford-Online/jbau-cs224n-redir-hotfix

Jbau cs224n redir hotfix
new help text for in-video exercises: whole numbers, and only 1 per timestamp
Fix path errors in NSIS installer
Fixed a date offset issue with Sunday digest publishing
translation error on migration
collision du joueur evec eneemis et obstacles et ecran game over
added library for motors
added library for motors
Lowest IO priority
Add small info hint about what main member is
manifest
serialize done
Fix static access warning
inventory serializer
added support for armv6j
Display updated toast only if not showing changes dialog.
Update changelog for 2.10 release (and 3rd beta).
Merge branch 'beta' of github.com:UweTrottmann/SeriesGuide into beta
Prepare for 2.10 release.
Latest translations from crowdin, now with Hebrew!
Clear friends list without headers
Implemented friend list: all friends and online only
Reverting tests//assign.p to its original state
Added note that FTL crashes if player crew exceeds 8
Apricot Berry -> Apicot Berry
Merge pull request #149 from etesp/patch-1

Apricot Berry -> Apicot Berry
Removed RBY+para+dig glitch (sic)
updated it translation
added charmander/bulba/squirtle event moves
Some new events
I don't know if this is entirely correct... and I think there might be a better way to do the html, (e.g. like joining it with beforeNewMessage and adding a html variable)
Revert "Some new events"

This reverts commit 3dc2a79d84b44acd88c9403b6b9dfcea16fec161.
Better way of doing it maybe
_line->Str
add client.changeName to client scripts
add an exit warning to the client
ability to toggle flashing in client
a few fixes for pm tabbing
fix sys.ban: silent kick, fix issue with tempbans
add lamperi's new script functions
fix for gen 5 heal bell
check save log if specified
actually check save battle logs if specified
remove troll characters
A few new script changes
Added an event for onChannelJoin
Added some new functions
-sys.zip(dir) zips up all the files from one folder (or a file if only one is specified)
-sys.extractZip(zipName, targetDir(optional)) zipName is the name of the zip file that's being extracted. targetDir is the name of the new folder
-sys.makeDir(dirname) makes a new folder with the name dirname
-sys.removeDir(dirname) removes a folder with the name dirname (Must be empty!)
-sys.getCurrentDir() gets the absolute path for the directory client/server is currently in
Fix FS#8
Merge branch 'master_v1' of https://github.com/Viderizer/pokemon-online into master_v1
Initilization of project
BREAKS COMPILATION: checkpoint ByteBuffer conversion.
BREAKS COMPILATION: make a go at auth classes.
BREAKS COMPILATION: make a pass at decimal.
BREAKS COMPILATION: make a pass at InvocationResponse.
BREAKS COMPILATION: make a pass at parameter set.
BREAKS COMPILATION: make a pass at Procedure
BREAKS COMPILATION: make a pass at rowbuilder.
Fix black display inside opaque water

Opaque water's solidness was being set to 2, like a normal node.
When you swim, it is treated like a solid block, and the display
goes black.  Setting it to 1 like transparent water allows you to
see.

It looks somewhat awkward when you swim, look up, and see an opaque
wall of water (the surface), but there isn't much that can be done
about it.  If you made the water transparent so it looked good,
it would defeat the purpose :) .
Properly initialize baseimg for texture modifier [combine:WxH:X,Y=filename:X,Y=filename2
Use proper alpha blit in some more texture modifiers
Don't crash in "unexpected multibyte character"; just print it in log. Github #222
Make shift the default descent control on ladders and when flying

"aux1_descends" setting switches to the old descend control.
Add InventoryList width property & allow custom crafting grids.
Add disable_jump and fall_damage_add_percent node groups
Add bouncy node group
Fix the bouncy node related stuff a bit
Smooth transition to the desert biome.
Attempt to fix flying gravel and dirt
A bunch of GUIKeyChangeMenu fixes

- Display message when associating a key already in use
- Fix issue for not beeing able to assign space to an action
- Cleaning up
- Make it build (by celeron55)
Fix GUIKeyChangeMenu so that '/' can be inserted on a finnish keyboard
Fix issue with openal mac os x compile
Fix github issue #224
Add overridable function for handling dropped items from nodes
Fix bug in moving a larger sized stack in inventory on top of another

- You have 2 stacks: a with x items and b with y<x items
- Take a with your mouse and place it on b
- Whole stack a moves to b
- (y * 2 - x) items move from b to a
- (x - y) items are left to the mouse cursor
Make inventory GUI do sane things when server-side inventory acts unusually
Fix moving stuff into a mismatched stack in a "infinite" inventory
Fix shift-descend to ladders from a floor
typo
Merge branch 'onphp-master' into onphp-1.0
Merge branch 'onphp-1.0' into 1.0-wapstart
Site updated at 2012-11-14 04:20:14 UTC
optimizations and aesthetic fixes
some optimizations to keyframe look up
Issue #12 solved; style improvements
CreamySample
Merge pull request #4 from a1145ah/master

pull request
Site updated at 2012-12-03 09:08:05 UTC
Added Flash Portion
Initial Commit
Commit gitignore
three ways of computing factorial
committing before removing
 Removed redundant .pngs
 small correction in a regular expression
badge instead of tag
Responding to pending/pages
Auto-click tab-grd-page when a selection is made in tab-grd-ws
open terminal inline
many tweaks to the inline terminal
update release info
Added another info source
Focal Point Sass mixin
Merge pull request #2 from danielguillan/sass-mixin

Focal Point Sass mixin
Added readers for a normal quaternion file.
fix database config and some gems, remove bogus replicated_model since we no longer have Octopus
Calcium Buffer System Introduced
Make a basic User model
D
git commit -am D
Finish the signup form
Site updated at 2012-11-10 23:27:50 UTC
Modify Drive.java for the number of args
Modify scheme.txt for the order of leaves
Animate the rocket ship
Animate the rocketship
pushing changes to git from Mac
updated the readme
initial plugin structure
installed rspec
installed devise
added the project model
Actualizada barra de busqueda
Creada template utilizable para implementación de microposts y timeline
Añadida funcionalidad de publicar microposts a la caja de texto en el home
Nuevo fondo para pantalla de registro
Merge branch 'development' of github.com:alessandrofg/NosTocoCruz into development
Los microposts de los usuarios ya se muestran en su home page, ordenados segun la fecha.
Merge branch 'development' of github.com:alessandrofg/NosTocoCruz into development
Modificados templates html y css
Añadidos tests básicos para la clase Friendship
Merge branch 'development' of github.com:alessandrofg/NosTocoCruz into development
Added OTA HTML tests to test 'config feature'
Always create ext2 images with minimum blocksize. Unmount lazy and free loopback device when unmounting ext2 images.
Restoring static methods for creating brokered messages.
Code review updates
Dificil

Galera, nao to conseguindo andar.
Estou com muitas dificuldades
Updated pom.xml
Prepared commercial release
Merge branch 'release' of github.com:alohaeditor/Aloha-Editor into release
Prepared changelog
Made changelog entry a little bit clearer
Merge branch 'release' of github.com:alohaeditor/Aloha-Editor into release
Updated license section
Updated version
[maven-release-plugin] prepare release alohaeditor-0.22.2-commercial
[maven-release-plugin] prepare for next development iteration
Preparing maven release
Post release cleanup
Prepared version for gpl release
[maven-release-plugin] prepare release alohaeditor-0.22.2
[maven-release-plugin] prepare for next development iteration
Preparing maven release
Post release cleanup
Fixed replacement of license during building of the commercial version
Prepared version for commercial release
[maven-release-plugin] prepare release alohaeditor-0.22.2-commercial
renaming: it is "Aloha Editor" not just "Aloha"
renaming: it is "Aloha Editor Guides" not just "Aloha Guides"
Merge pull request #488 from evo42/dev

it is "Aloha Editor" not just "Aloha"
Removed the commands plugin, as it seems to be pretty useless.
Fix initialization: Add missing phase function

Initialization function was missing from one of the initialization
phases when the initialization code was refactored.
New class with delegate, added photo as a property to MWPhoto class
memory issue present
Fixed memory over release problem - delegate is a 'weak' property so does not need to be released
git ignore angepasst (optimal ist anders, aber zumindest sind bin und obj nun raus)
VIEW: user fix
Change cron dependency.
* fixed share menu
Fixed wrong for statement
Fix base url.
Fix login not being displayed.
Added temporary data for Max
Change a few loop index variable names
Site updated at 2012-05-28 21:22:40 UTC
Site updated at 2012-08-16 23:54:17 UTC
Update to Bootstrap v2.1.0
factorial- improved indentation
JavaScript Exercise10
Added Test/Help-motors to the Tank-Kernel for Timer2A and Timer2B. Controlling all motors (8 and 16 bit timers, but without smooth) seems to work.
Fixed production_url in config.yml
Fixed typo.

git-svn-id: https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom@1421777 13f79535-47bb-0310-9956-ffa450edef68
add message timestamp
change DJ schedule table
get current song info
fix bug MPD connection
fix bug audio control in IE
#82 Elided comments other than Active ones.
added logger from moochine
Changed build to 32/64 bit and updated README
Rework a bit to handle root replacement proxies
FIXING THE Sketch TEMPLATE
BUG FIX IN XFont: SOME ARRAYS WERE DELETE USING delete INSTEAD of delete[]
Add support for aliases in locations

An alias can be specified for a location using alias_root instead of
www_root.  Aliases in nginx are similar to root directives except that
the part of the request that matches the location is stripped when
creating the path to file.  See
http://wiki.nginx.org/HttpCoreModule#alias for an example.
Merge pull request #1 from armonge/location-alias

Add support for aliases in locations
ran the uberScript.R
Correct implementation of defineProperty to match EcmaScript spec. Need to write some tests for this though.
Fixing bugs; add login button;
Add a general request timeout for GET requests.
updated

fixed some grammar blah blah
Excercise #1
show user page looks a bit nicer now
admins can now view any user's courses by visiting their profile page
options to deny warps into enemy/ally/neutral; enderpearl reports fix
for OPs, nolonger reporting every enderpearl, just the relevant ones
Generated scaffolding for projects
Generated scaffolding for projects
Added some projects views and model logic. Added seeds for my admin account and some projects
Made a good details page
Added test for projects
Got my stests up to scratch
Merge pull request #6 from baugarten/projects

Ok. I'm going to merge projects -- I'll fix pictures in a future iteration